diff --git a/Assets/Editor/MyEditorUtil.cs b/Assets/Editor/MyEditorUtil.cs index b5d24eb2b..a83da6fc9 100644 --- a/Assets/Editor/MyEditorUtil.cs +++ b/Assets/Editor/MyEditorUtil.cs @@ -443,6 +443,40 @@ public static class MyEditorUtil } } + [MenuItem("Edit/SetCollider", false, -999)] + static void SetCollider() + { + var selectedObjects = Selection.gameObjects; + + foreach (var go in selectedObjects) + { + var m_bc = go.GetComponent(); + if (m_bc == null) m_bc = go.AddComponent(); + + var rds = go.GetComponentsInChildren(); + SkinnedMeshRenderer m_smr = null; + if (rds.Length == 1) m_smr = rds[0]; + else + { + for (int i = 0; i < rds.Length; i++) + { + if (rds[i].name.ToLower().Contains("skin")) + { + m_smr = rds[i]; + break; + } + } + if (m_smr == null) m_smr = rds[0]; + } + + m_smr.updateWhenOffscreen = true; + + objectSettingsList.Add(new ObjectSettings { m_bc = m_bc, m_smr = m_smr, tick = 10 }); + + EditorApplication.update += UpdateAllObjects; + } + } + //[MenuItem("Edit/Find All Particle", false, -103)] //public static void FindAllParticle() //{ diff --git a/Assets/ResWork/Table/Export/PetList.json b/Assets/ResWork/Table/Export/PetList.json index 6beb98edd..3fd62794f 100644 --- a/Assets/ResWork/Table/Export/PetList.json +++ b/Assets/ResWork/Table/Export/PetList.json @@ -1 +1 @@ -[{"n_PetID": "50001", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "4.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Podol_D.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50002", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Batty_A.prefab", "f_Scale": "1.3", "f_UIScale": "2"}, {"n_PetID": "50003", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Anto_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50004", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_Spider_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50005", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Pig_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50006", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Scopionto_A.prefab", "f_Scale": "3", "f_UIScale": "2"}, {"n_PetID": "50007", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Planta_Kid.prefab", "f_Scale": "1.1", "f_UIScale": "2"}, {"n_PetID": "50008", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Snailo_C.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50009", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Planta_Slave.prefab", "f_Scale": "1.1", "f_UIScale": "2"}, {"n_PetID": "50010", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Turnipa_Sweet.prefab", "f_Scale": "0.6", "f_UIScale": "2"}, {"n_PetID": "50011", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Platopo_A.prefab", "f_Scale": "3", "f_UIScale": "2"}, {"n_PetID": "50012", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Racco_B.prefab", "f_Scale": "1.1", "f_UIScale": "2"}, {"n_PetID": "50013", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702003", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Pig_B2.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50014", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702004", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Chick_A.prefab", "f_Scale": "2.6", "f_UIScale": "2"}, {"n_PetID": "50015", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702014", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Condore_B.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50016", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Beez_Honey.prefab", "f_Scale": "1.1", "f_UIScale": "2"}, {"n_PetID": "50017", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Scarabro_A.prefab", "f_Scale": "3", "f_UIScale": "2"}, {"n_PetID": "50018", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702007", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Gazer_A.prefab", "f_Scale": "2", "f_UIScale": "2"}, {"n_PetID": "50019", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_Starfish_D.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50020", "n_PetGrade": "3", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Big_Boar_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50021", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702002", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Brother_Penguin_A.prefab", "f_Scale": "0.9", "f_UIScale": "2"}, {"n_PetID": "50022", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702010", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Squif_B.prefab", "f_Scale": "3", "f_UIScale": "2"}, {"n_PetID": "50023", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702008", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Whispa_B.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50024", "n_PetGrade": "3", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_OctopusAc.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50025", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702006", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute Butterfly_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50026", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702005", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Puffe_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50027", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702015", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Pota_D.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50028", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Picoco_A.prefab", "f_Scale": "0.6", "f_UIScale": "2"}, {"n_PetID": "50029", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Ice_Bear_A.prefab", "f_Scale": "0.5", "f_UIScale": "2"}, {"n_PetID": "50030", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702016", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Rabby_Queen_White.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50031", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702011", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Teruru_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50032", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702013", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Teruru_Ba.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50033", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702005", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Poho_D.prefab", "f_Scale": "1.2", "f_UIScale": "2"}, {"n_PetID": "50034", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702012", "n_PetPassiveSkill": "701004", "s_PetPrefab": "Assets/Res_Addr/Pet/Angez_A.prefab", "f_Scale": "1.2", "f_UIScale": "2"}] \ No newline at end of file +[{"n_PetID": "50001", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "4.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Podol_D.prefab", "f_Scale": "1.5", "f_UIScale": "3", "f_UIOffSet_y": "0"}, {"n_PetID": "50002", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Batty_A.prefab", "f_Scale": "1.5", "f_UIScale": "3", "f_UIOffSet_y": "0"}, {"n_PetID": "50003", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Anto_A.prefab", "f_Scale": "1.3", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50004", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_Spider_A.prefab", "f_Scale": "2", "f_UIScale": "3", "f_UIOffSet_y": "0"}, {"n_PetID": "50005", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Pig_A.prefab", "f_Scale": "1.3", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50006", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Scopionto_A.prefab", "f_Scale": "4", "f_UIScale": "7", "f_UIOffSet_y": "0"}, {"n_PetID": "50007", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Planta_Kid.prefab", "f_Scale": "1.5", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50008", "n_PetGrade": "1", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Snailo_C.prefab", "f_Scale": "1.5", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50009", "n_PetGrade": "1", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.5", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Planta_Slave.prefab", "f_Scale": "1.5", "f_UIScale": "2", "f_UIOffSet_y": "0"}, {"n_PetID": "50010", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Turnipa_Sweet.prefab", "f_Scale": "0.6", "f_UIScale": "0.8", "f_UIOffSet_y": "0"}, {"n_PetID": "50011", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Platopo_A.prefab", "f_Scale": "6", "f_UIScale": "14", "f_UIOffSet_y": "0"}, {"n_PetID": "50012", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Racco_B.prefab", "f_Scale": "1.7", "f_UIScale": "2.3", "f_UIOffSet_y": "0"}, {"n_PetID": "50013", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702003", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Pig_B2.prefab", "f_Scale": "1.3", "f_UIScale": "2.3", "f_UIOffSet_y": "0"}, {"n_PetID": "50014", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702004", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Chick_A.prefab", "f_Scale": "4", "f_UIScale": "6.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50015", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702014", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Condore_B.prefab", "f_Scale": "1.2", "f_UIScale": "2.3", "f_UIOffSet_y": "-0.5"}, {"n_PetID": "50016", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Beez_Honey.prefab", "f_Scale": "1.3", "f_UIScale": "2.2", "f_UIOffSet_y": "-0.2"}, {"n_PetID": "50017", "n_PetGrade": "2", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Scarabro_A.prefab", "f_Scale": "2", "f_UIScale": "5", "f_UIOffSet_y": "0"}, {"n_PetID": "50018", "n_PetGrade": "2", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.6", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702007", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Fire_Gazer_A.prefab", "f_Scale": "1.5", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50019", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_Starfish_D.prefab", "f_Scale": "1.3", "f_UIScale": "2.3", "f_UIOffSet_y": "0"}, {"n_PetID": "50020", "n_PetGrade": "3", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Big_Boar_A.prefab", "f_Scale": "1.2", "f_UIScale": "2.2", "f_UIOffSet_y": "0"}, {"n_PetID": "50021", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702002", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Brother_Penguin_A.prefab", "f_Scale": "0.7", "f_UIScale": "1.3", "f_UIOffSet_y": "0"}, {"n_PetID": "50022", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702010", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Squif_B.prefab", "f_Scale": "4", "f_UIScale": "8", "f_UIOffSet_y": "0"}, {"n_PetID": "50023", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702008", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Whispa_B.prefab", "f_Scale": "1.3", "f_UIScale": "2.2", "f_UIOffSet_y": "0"}, {"n_PetID": "50024", "n_PetGrade": "3", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute_OctopusAc.prefab", "f_Scale": "1.2", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50025", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702006", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Cute Butterfly_A.prefab", "f_Scale": "1", "f_UIScale": "2.3", "f_UIOffSet_y": "-0.4"}, {"n_PetID": "50026", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702005", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Puffe_A.prefab", "f_Scale": "1.5", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50027", "n_PetGrade": "3", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.7", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702015", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Pota_D.prefab", "f_Scale": "1.5", "f_UIScale": "2.5", "f_UIOffSet_y": "0"}, {"n_PetID": "50028", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Picoco_A.prefab", "f_Scale": "0.45", "f_UIScale": "0.8", "f_UIOffSet_y": "0"}, {"n_PetID": "50029", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702001", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Ice_Bear_A.prefab", "f_Scale": "0.4", "f_UIScale": "0.7", "f_UIOffSet_y": "0"}, {"n_PetID": "50030", "n_PetGrade": "4", "e_AttackType": "Physics", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702016", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Rabby_Queen_White.prefab", "f_Scale": "1.5", "f_UIScale": "3", "f_UIOffSet_y": "0"}, {"n_PetID": "50031", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702011", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Teruru_A.prefab", "f_Scale": "1.3", "f_UIScale": "2", "f_UIOffSet_y": "0"}, {"n_PetID": "50032", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702013", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Teruru_Ba.prefab", "f_Scale": "1.3", "f_UIScale": "2", "f_UIOffSet_y": "0"}, {"n_PetID": "50033", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702005", "n_PetPassiveSkill": "701005", "s_PetPrefab": "Assets/Res_Addr/Pet/Poho_D.prefab", "f_Scale": "1.1", "f_UIScale": "2", "f_UIOffSet_y": "0"}, {"n_PetID": "50034", "n_PetGrade": "4", "e_AttackType": "Magic", "n_DefaultATK": "330105", "n_DefaultDEF": "330106", "n_DefaultM_DEF": "330109", "n_DefaultHP": "330107", "f_PetStatRate": "0.8", "f_AttackRange": "5.4", "s_PetAttackPrefab": "MeleeAttack", "f_PetMoveSPD": "5", "f_PetAttackSPD": "1", "n_PetActiveSkill": "702012", "n_PetPassiveSkill": "701004", "s_PetPrefab": "Assets/Res_Addr/Pet/Angez_A.prefab", "f_Scale": "1", "f_UIScale": "2", "f_UIOffSet_y": "-0.8"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index d558e22d4..db1b24579 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Map/Map_C01.prefab b/Assets/Res_Addr/Map/Map_C01.prefab index 46fc349ac..71aeeef03 100644 --- a/Assets/Res_Addr/Map/Map_C01.prefab +++ b/Assets/Res_Addr/Map/Map_C01.prefab @@ -2477,7 +2477,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 935c913087b349141aa632be4f8c2689, type: 3} m_Name: m_EditorClassIdentifier: - n_MonsterID: 10001 + n_MonsterID: 10002 n_SpawnerId: 1 --- !u!1 &2246745228298233982 GameObject: diff --git a/Assets/Res_Addr/Mobs/FieldBoss/Lusif_B.prefab b/Assets/Res_Addr/Mobs/FieldBoss/Lusif_B.prefab index 5466c7e79..f8badf568 100644 --- a/Assets/Res_Addr/Mobs/FieldBoss/Lusif_B.prefab +++ b/Assets/Res_Addr/Mobs/FieldBoss/Lusif_B.prefab @@ -31,89 +31,6 @@ Transform: m_Children: [] m_Father: {fileID: 4673050221343872805} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1423490332643462510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8701877896652085869} - - component: {fileID: 3826539125309010751} - - component: {fileID: 7003767516654881035} - m_Layer: 3 - m_Name: Indicator_attack2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8701877896652085869 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423490332643462510} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 4} - m_LocalScale: {x: 0.5, y: 6, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4673050221343872805} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3826539125309010751 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423490332643462510} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7003767516654881035 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423490332643462510} - 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: 3e1c80888ebc582469572ddac13cc967, 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} --- !u!1 &4673050221343967937 GameObject: m_ObjectHideFlags: 0 @@ -321,10 +238,7 @@ Transform: m_Children: - {fileID: 4673050221343872803} - {fileID: 4673050221343872807} - - {fileID: 5290290598397568076} - - {fileID: 8701877896652085869} - {fileID: 2055484406614287527} - - {fileID: 5258183687528655824} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-3981808153787907440 @@ -2176,117 +2090,3 @@ Transform: - {fileID: 4673050221343872849} m_Father: {fileID: 4673050221343872861} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4830602672973059602 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5290290598397568076} - - component: {fileID: 3055800858902355433} - - component: {fileID: 5033895193453379826} - m_Layer: 3 - m_Name: Indicator_attack1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5290290598397568076 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4830602672973059602} - serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 1.5} - m_LocalScale: {x: 1, y: 3, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4673050221343872805} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3055800858902355433 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4830602672973059602} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5033895193453379826 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4830602672973059602} - 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: 3e1c80888ebc582469572ddac13cc967, 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} ---- !u!1 &7256889354691796459 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5258183687528655824} - m_Layer: 3 - m_Name: Lusif_AttackDmg_pos2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5258183687528655824 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7256889354691796459} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.3, z: 1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4673050221343872805} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Res_Addr/Pet/Angez_A.prefab b/Assets/Res_Addr/Pet/Angez_A.prefab index 6cb43a9e8..d53f77960 100644 --- a/Assets/Res_Addr/Pet/Angez_A.prefab +++ b/Assets/Res_Addr/Pet/Angez_A.prefab @@ -143,7 +143,7 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 1 + m_UpdateWhenOffscreen: 0 m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 4300000, guid: 4ac06090b2b5fe343bb5e0bb27eee186, type: 3} m_Bones: @@ -273,8 +273,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 0.7951524, z: 0.3} + m_Center: {x: -0.00000011920929, y: 0.6431725, z: -0.013790637} --- !u!195 &-9168100989360634000 NavMeshAgent: m_ObjectHideFlags: 0 @@ -284,10 +284,10 @@ NavMeshAgent: m_GameObject: {fileID: 15960668110080806} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.15 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -296,7 +296,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3749819652558227710 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Anto_A.prefab b/Assets/Res_Addr/Pet/Anto_A.prefab index 191460000..74efb17fb 100644 --- a/Assets/Res_Addr/Pet/Anto_A.prefab +++ b/Assets/Res_Addr/Pet/Anto_A.prefab @@ -409,7 +409,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9025069231346383166} @@ -475,8 +475,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.6915506, y: 0.48668313, z: 0.99353135} - m_Center: {x: -0.00000017881393, y: 0.21770105, z: -0.0136229545} + m_Size: {x: 0.5, y: 0.632688, z: 0.9} + m_Center: {x: -0.00000025182962, y: 0.28301135, z: -0.01770984} --- !u!195 &271691968364959590 NavMeshAgent: m_ObjectHideFlags: 0 @@ -489,7 +489,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -498,7 +498,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-1952563911509027337 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Batty_A.prefab b/Assets/Res_Addr/Pet/Batty_A.prefab index 19c12747c..b2e4b2cd8 100644 --- a/Assets/Res_Addr/Pet/Batty_A.prefab +++ b/Assets/Res_Addr/Pet/Batty_A.prefab @@ -234,7 +234,7 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 1 + m_UpdateWhenOffscreen: 0 m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 4300000, guid: 61338ba8c4d778948bdee637b299360a, type: 3} m_Bones: @@ -283,7 +283,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6254211654831459092} @@ -349,8 +349,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 0.5, y: 0.5371508, z: 0.2} + m_Center: {x: 0, y: 0.34529734, z: -0.00058635324} --- !u!195 &-7697515277932428742 NavMeshAgent: m_ObjectHideFlags: 0 @@ -360,10 +360,10 @@ NavMeshAgent: m_GameObject: {fileID: 6254211654831167286} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.15 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -372,7 +372,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &2692390876420644698 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Beez_Honey.prefab b/Assets/Res_Addr/Pet/Beez_Honey.prefab index 525fa5279..38540f46b 100644 --- a/Assets/Res_Addr/Pet/Beez_Honey.prefab +++ b/Assets/Res_Addr/Pet/Beez_Honey.prefab @@ -157,7 +157,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7448467212269955178} @@ -223,8 +223,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 0.7, y: 0.70312876, z: 0.3} + m_Center: {x: 0, y: 0.3609767, z: 0.00070965587} --- !u!195 &-5199939486761273816 NavMeshAgent: m_ObjectHideFlags: 0 @@ -237,7 +237,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -246,7 +246,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &5614852348112568661 Rigidbody: m_ObjectHideFlags: 0 @@ -349,7 +349,7 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 1 + m_UpdateWhenOffscreen: 0 m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 4300000, guid: 70b2001f2fac3bd45a18981429f7f2ed, type: 3} m_Bones: diff --git a/Assets/Res_Addr/Pet/Big_Boar_A.prefab b/Assets/Res_Addr/Pet/Big_Boar_A.prefab index 2f049e33b..620661395 100644 --- a/Assets/Res_Addr/Pet/Big_Boar_A.prefab +++ b/Assets/Res_Addr/Pet/Big_Boar_A.prefab @@ -758,7 +758,7 @@ Transform: 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_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2576961665858786191} @@ -824,8 +824,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.4456331, y: 0.8052457, z: 0.8718839} - m_Center: {x: 0.000000014500612, y: 0.30545655, z: 0.005372286} + m_Size: {x: 0.3, y: 0.9662948, z: 0.6} + m_Center: {x: 0.000000017400735, y: 0.36654785, z: 0.006446749} --- !u!195 &3093055809677236633 NavMeshAgent: m_ObjectHideFlags: 0 @@ -835,10 +835,10 @@ NavMeshAgent: m_GameObject: {fileID: 4929261757231762885} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.22 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -847,7 +847,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-4000563050199884784 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Brother_Penguin_A.prefab b/Assets/Res_Addr/Pet/Brother_Penguin_A.prefab index dcc7fdde0..46c1f1dc1 100644 --- a/Assets/Res_Addr/Pet/Brother_Penguin_A.prefab +++ b/Assets/Res_Addr/Pet/Brother_Penguin_A.prefab @@ -507,7 +507,7 @@ Transform: 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_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2664571060736703760} @@ -573,8 +573,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.1069523, y: 1.0576622, z: 0.8334167} - m_Center: {x: 0.0000004172325, y: 0.51178765, z: -0.021925937} + m_Size: {x: 0.7748666, y: 1, z: 0.5833916} + m_Center: {x: 0.00000029206277, y: 0.3582514, z: -0.015348157} --- !u!195 &-5428389849862663757 NavMeshAgent: m_ObjectHideFlags: 0 @@ -584,10 +584,10 @@ NavMeshAgent: m_GameObject: {fileID: 2570439392954719035} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.4 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -596,7 +596,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-8116847239488704870 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Condore_B.prefab b/Assets/Res_Addr/Pet/Condore_B.prefab index 95b117133..50ab5983d 100644 --- a/Assets/Res_Addr/Pet/Condore_B.prefab +++ b/Assets/Res_Addr/Pet/Condore_B.prefab @@ -618,7 +618,7 @@ Transform: 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_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2589482585013430788} @@ -684,8 +684,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8333773, y: 0.5324587, z: 0.5162431} - m_Center: {x: 0.00012687704, y: 0.4212873, z: 0.1061043} + m_Size: {x: 0.5, y: 0.63895047, z: 0.5} + m_Center: {x: 0.00015221667, y: 0.5055448, z: 0.12732513} --- !u!195 &-2011178401611193339 NavMeshAgent: m_ObjectHideFlags: 0 @@ -695,10 +695,10 @@ NavMeshAgent: m_GameObject: {fileID: 6626512230146418097} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.2 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -707,7 +707,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-2466179650832594747 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Cute Butterfly_A.prefab b/Assets/Res_Addr/Pet/Cute Butterfly_A.prefab index f9a970a34..6d69f12e3 100644 --- a/Assets/Res_Addr/Pet/Cute Butterfly_A.prefab +++ b/Assets/Res_Addr/Pet/Cute Butterfly_A.prefab @@ -478,7 +478,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.0459738, y: 0.6367168, z: 0.22373521} + m_Size: {x: 0.75, y: 0.6367168, z: 0.22373521} m_Center: {x: -0.0001671449, y: 0.36607063, z: 7.14508e-20} --- !u!195 &-8649575731811266085 NavMeshAgent: @@ -489,10 +489,10 @@ NavMeshAgent: m_GameObject: {fileID: 2258042982238242075} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.15 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -501,7 +501,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-448836907434873343 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Cute_OctopusAc.prefab b/Assets/Res_Addr/Pet/Cute_OctopusAc.prefab index 33c33f71f..2eddd8e69 100644 --- a/Assets/Res_Addr/Pet/Cute_OctopusAc.prefab +++ b/Assets/Res_Addr/Pet/Cute_OctopusAc.prefab @@ -279,7 +279,7 @@ Transform: 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_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7630159245973627986} @@ -345,8 +345,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.55609554, y: 0.46936917, z: 0.55609554} - m_Center: {x: 0, y: 0.23456872, z: 0} + m_Size: {x: 0.55, y: 0.56324303, z: 0.5} + m_Center: {x: 0, y: 0.2814825, z: 0} --- !u!195 &4841447826484309688 NavMeshAgent: m_ObjectHideFlags: 0 @@ -359,7 +359,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -368,7 +368,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3678578088054382039 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Cute_Spider_A.prefab b/Assets/Res_Addr/Pet/Cute_Spider_A.prefab index 918444c50..2b8b9c3e5 100644 --- a/Assets/Res_Addr/Pet/Cute_Spider_A.prefab +++ b/Assets/Res_Addr/Pet/Cute_Spider_A.prefab @@ -547,7 +547,7 @@ Transform: 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_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4010108211847482603} @@ -613,8 +613,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.5642313, y: 0.3047139, z: 0.26802945} - m_Center: {x: 0, y: 0.11909487, z: 0.000002026558} + m_Size: {x: 0.5, y: 0.6094278, z: 0.3} + m_Center: {x: 0, y: 0.23818974, z: 0.000004053116} --- !u!195 &5754568502283664921 NavMeshAgent: m_ObjectHideFlags: 0 @@ -624,10 +624,10 @@ NavMeshAgent: m_GameObject: {fileID: 4010108211847516365} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.16 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -636,7 +636,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3405388719412805440 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Cute_Starfish_D.prefab b/Assets/Res_Addr/Pet/Cute_Starfish_D.prefab index 4a603e3aa..f3126be2e 100644 --- a/Assets/Res_Addr/Pet/Cute_Starfish_D.prefab +++ b/Assets/Res_Addr/Pet/Cute_Starfish_D.prefab @@ -475,7 +475,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1204054498601224731} @@ -541,8 +541,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.6619078, y: 0.6626863, z: 0.20829962} - m_Center: {x: -0.00013872981, y: 0.20879337, z: 0.010743111} + m_Size: {x: 0.5, y: 0.86149216, z: 0.27078947} + m_Center: {x: -0.00018032937, y: 0.2714314, z: 0.013966049} --- !u!195 &-259296061226000116 NavMeshAgent: m_ObjectHideFlags: 0 @@ -552,10 +552,10 @@ NavMeshAgent: m_GameObject: {fileID: 1204054498600932925} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.2 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -564,7 +564,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &401777486391062989 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Chick_A.prefab b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab index d6fb111fb..dacc787b6 100644 --- a/Assets/Res_Addr/Pet/Fire_Chick_A.prefab +++ b/Assets/Res_Addr/Pet/Fire_Chick_A.prefab @@ -350,7 +350,7 @@ Transform: 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_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1227025145939215624} @@ -416,8 +416,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.14728644, y: 0.25896907, z: 0.17754994} - m_Center: {x: -0.0011520272, y: 0.09747165, z: 0.015833952} + m_Size: {x: 0.2, y: 1.0358763, z: 0.2} + m_Center: {x: 0, y: 0, z: 0} --- !u!195 &-561957770754484286 NavMeshAgent: m_ObjectHideFlags: 0 @@ -427,10 +427,10 @@ NavMeshAgent: m_GameObject: {fileID: 6798239121051692547} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.1 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -439,7 +439,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-7236217036285258734 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Chick_B.prefab b/Assets/Res_Addr/Pet/Fire_Chick_B.prefab index b7ead245f..5cda78e00 100644 --- a/Assets/Res_Addr/Pet/Fire_Chick_B.prefab +++ b/Assets/Res_Addr/Pet/Fire_Chick_B.prefab @@ -319,7 +319,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1250002129814898330} @@ -385,8 +385,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.19147238, y: 0.33665973, z: 0.23081493} - m_Center: {x: -0.0014976354, y: 0.12671313, z: 0.02058414} + m_Size: {x: 0.2, y: 1.0358763, z: 0.2} + m_Center: {x: 0, y: 0, z: 0} --- !u!195 &7655453022358340458 NavMeshAgent: m_ObjectHideFlags: 0 @@ -396,10 +396,10 @@ NavMeshAgent: m_GameObject: {fileID: 6198772549856221266} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.1 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -408,7 +408,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &2190735190468570871 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Gazer_A.prefab b/Assets/Res_Addr/Pet/Fire_Gazer_A.prefab index 3949d2e69..5c420a8ba 100644 --- a/Assets/Res_Addr/Pet/Fire_Gazer_A.prefab +++ b/Assets/Res_Addr/Pet/Fire_Gazer_A.prefab @@ -31,7 +31,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6691946198352377335} @@ -97,8 +97,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.34808996, y: 0.4575299, z: 0.29242235} - m_Center: {x: -0.00842341, y: 0.31512952, z: 0.00023773313} + m_Size: {x: 0.3, y: 1.0358763, z: 0.3} + m_Center: {x: 0, y: 0.3, z: 0} --- !u!195 &-776213662935875075 NavMeshAgent: m_ObjectHideFlags: 0 @@ -108,10 +108,10 @@ NavMeshAgent: m_GameObject: {fileID: 6691946198352669137} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.17 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -120,7 +120,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &4029114808144653388 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Pig_A.prefab b/Assets/Res_Addr/Pet/Fire_Pig_A.prefab index 30b284316..1afa501f8 100644 --- a/Assets/Res_Addr/Pet/Fire_Pig_A.prefab +++ b/Assets/Res_Addr/Pet/Fire_Pig_A.prefab @@ -159,7 +159,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7953982989127190958} @@ -225,8 +225,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.4456331, y: 0.6864175, z: 0.8247948} - m_Center: {x: 0.000000017285213, y: 0.24483684, z: 0.019949734} + m_Size: {x: 0.4, y: 0.9662948, z: 0.7} + m_Center: {x: 0, y: 0.36654785, z: 0} --- !u!195 &-7395320519905846345 NavMeshAgent: m_ObjectHideFlags: 0 @@ -239,7 +239,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -248,7 +248,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &2776331071705989124 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Fire_Pig_B2.prefab b/Assets/Res_Addr/Pet/Fire_Pig_B2.prefab index 3ff4ffd70..664fe0229 100644 --- a/Assets/Res_Addr/Pet/Fire_Pig_B2.prefab +++ b/Assets/Res_Addr/Pet/Fire_Pig_B2.prefab @@ -285,7 +285,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1954406165797041847} @@ -351,8 +351,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.4456331, y: 0.7721057, z: 0.89558345} - m_Center: {x: 0.000000014118189, y: 0.2871756, z: -0.00059729815} + m_Size: {x: 0.4, y: 0.9662948, z: 0.7} + m_Center: {x: 0, y: 0.36654785, z: 0} --- !u!195 &2184892575159665448 NavMeshAgent: m_ObjectHideFlags: 0 @@ -365,7 +365,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -374,7 +374,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &4502789066766784300 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Ice_Bear_A.prefab b/Assets/Res_Addr/Pet/Ice_Bear_A.prefab index 227f9fad9..14f741d6c 100644 --- a/Assets/Res_Addr/Pet/Ice_Bear_A.prefab +++ b/Assets/Res_Addr/Pet/Ice_Bear_A.prefab @@ -223,7 +223,7 @@ Transform: 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_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1340220392109625277} @@ -289,8 +289,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 4.0820284, y: 2.3779993, z: 1.746314} - m_Center: {x: 0.0006223917, y: 0.6575931, z: 0} + m_Size: {x: 1.6328114, y: 0.9511997, z: 0.6985256} + m_Center: {x: 0.0002489567, y: 0.26303726, z: 0} --- !u!195 &8105885492462576249 NavMeshAgent: m_ObjectHideFlags: 0 @@ -303,7 +303,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -312,7 +312,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &6367931448279036057 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Picoco_A.prefab b/Assets/Res_Addr/Pet/Picoco_A.prefab index ec8157acd..3629260eb 100644 --- a/Assets/Res_Addr/Pet/Picoco_A.prefab +++ b/Assets/Res_Addr/Pet/Picoco_A.prefab @@ -31,7 +31,7 @@ Transform: 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_LocalScale: {x: 0.45, y: 0.45, z: 0.45} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2674274046982426931} @@ -97,8 +97,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.9347361, y: 2.9134035, z: 2.8843474} - m_Center: {x: 0, y: 0.8154055, z: 0.25569582} + m_Size: {x: 1.03, y: 1.8830914, z: 1.6975119} + m_Center: {x: 0, y: 0.8600871, z: 0.3589431} --- !u!195 &-5303615069323853705 NavMeshAgent: m_ObjectHideFlags: 0 @@ -108,10 +108,10 @@ NavMeshAgent: m_GameObject: {fileID: 484855153004011617} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.25 + m_Radius: 0.4 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -120,7 +120,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &6103119305999636391 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Planta_Kid.prefab b/Assets/Res_Addr/Pet/Planta_Kid.prefab index dcb781614..2e83d76cd 100644 --- a/Assets/Res_Addr/Pet/Planta_Kid.prefab +++ b/Assets/Res_Addr/Pet/Planta_Kid.prefab @@ -444,7 +444,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1384626280227870384} @@ -485,7 +485,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gos_Effect: [] - m_Role: 2 + m_Role: 1 m_SubRole: 0 m_AttackType: 0 m_animation: {fileID: 0} @@ -511,7 +511,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 3 m_Size: {x: 0.43673393, y: 0.6555184, z: 0.5133086} - m_Center: {x: 0, y: 0.32799867, z: 0.00364241} + m_Center: {x: 0, y: 0.3279987, z: 0.00364241} --- !u!195 &1076730719873803950 NavMeshAgent: m_ObjectHideFlags: 0 @@ -533,7 +533,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 3 --- !u!54 &4438452915930017732 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Planta_Slave.prefab b/Assets/Res_Addr/Pet/Planta_Slave.prefab index e8c46b21c..311b5d130 100644 --- a/Assets/Res_Addr/Pet/Planta_Slave.prefab +++ b/Assets/Res_Addr/Pet/Planta_Slave.prefab @@ -288,7 +288,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6639833366510754610} @@ -354,8 +354,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.65881103, y: 0.5033039, z: 0.65881103} - m_Center: {x: 0, y: 0.25189143, z: 0.000032275915} + m_Size: {x: 0.9882165, y: 0.7549559, z: 0.9882165} + m_Center: {x: 0, y: 0.37783718, z: 0.000048413873} --- !u!195 &7837462110542459287 NavMeshAgent: m_ObjectHideFlags: 0 @@ -368,7 +368,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -377,7 +377,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3025109991528601268 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Platopo_A.prefab b/Assets/Res_Addr/Pet/Platopo_A.prefab index ed3ca08e6..d829931aa 100644 --- a/Assets/Res_Addr/Pet/Platopo_A.prefab +++ b/Assets/Res_Addr/Pet/Platopo_A.prefab @@ -476,7 +476,7 @@ Transform: 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_LocalScale: {x: 6, y: 6, z: 6} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3555279861295263200} @@ -542,8 +542,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.13570909, y: 0.16179918, z: 0.24282604} - m_Center: {x: 0.000000007450581, y: 0.029104678, z: -0.009572949} + m_Size: {x: 0.8142545, y: 0.97079504, z: 1.4569561} + m_Center: {x: 0.000000044703484, y: 0.17462806, z: -0.05743771} --- !u!195 &3967412265046963126 NavMeshAgent: m_ObjectHideFlags: 0 @@ -556,7 +556,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -565,7 +565,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-8074526517145386525 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Podol_D.prefab b/Assets/Res_Addr/Pet/Podol_D.prefab index 135050bfd..2c5e649be 100644 --- a/Assets/Res_Addr/Pet/Podol_D.prefab +++ b/Assets/Res_Addr/Pet/Podol_D.prefab @@ -181,7 +181,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2424150409317392460} @@ -247,8 +247,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.52621794, y: 0.3503551, z: 0.5262178} - m_Center: {x: 0, y: 0.17517748, z: 0} + m_Size: {x: 0.7893269, y: 0.52553266, z: 0.7893267} + m_Center: {x: 0, y: 0.26276627, z: 0} --- !u!195 &-3614261012209219495 NavMeshAgent: m_ObjectHideFlags: 0 @@ -261,7 +261,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -270,7 +270,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &6632412557535626712 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Poho_D.prefab b/Assets/Res_Addr/Pet/Poho_D.prefab index c22c1fb2a..7ea5fdb80 100644 --- a/Assets/Res_Addr/Pet/Poho_D.prefab +++ b/Assets/Res_Addr/Pet/Poho_D.prefab @@ -97,7 +97,7 @@ Transform: 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 349896033690311435} @@ -163,8 +163,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.0722263, y: 0.49158373, z: 0.51406085} - m_Center: {x: 0.00000020861626, y: 0.24579181, z: 0} + m_Size: {x: 1.179449, y: 0.5407421, z: 0.56546694} + m_Center: {x: 0.00000022947789, y: 0.27037102, z: 0} --- !u!195 &-6579814376504748293 NavMeshAgent: m_ObjectHideFlags: 0 @@ -177,7 +177,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -186,7 +186,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3657055118472729842 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Pota_D.prefab b/Assets/Res_Addr/Pet/Pota_D.prefab index e670cbb27..f68ecd6bb 100644 --- a/Assets/Res_Addr/Pet/Pota_D.prefab +++ b/Assets/Res_Addr/Pet/Pota_D.prefab @@ -379,7 +379,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4020715252637310921} @@ -445,8 +445,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.38980892, y: 0.49202448, z: 0.32984254} - m_Center: {x: 0, y: 0.24533394, z: 0.0034917146} + m_Size: {x: 0.58471346, y: 0.73803675, z: 0.4947638} + m_Center: {x: 0, y: 0.36800092, z: 0.005237572} --- !u!195 &4516863441334051891 NavMeshAgent: m_ObjectHideFlags: 0 @@ -459,7 +459,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -468,7 +468,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-225471120880839339 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Puffe_A.prefab b/Assets/Res_Addr/Pet/Puffe_A.prefab index 8dcb63156..fa79ecea0 100644 --- a/Assets/Res_Addr/Pet/Puffe_A.prefab +++ b/Assets/Res_Addr/Pet/Puffe_A.prefab @@ -315,7 +315,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8418656659574094856} @@ -381,8 +381,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.35792392, y: 0.57919085, z: 0.7498705} - m_Center: {x: 0, y: 0.23400149, z: 0.02889186} + m_Size: {x: 0.53688586, y: 0.8687863, z: 1.1248057} + m_Center: {x: 0, y: 0.35100222, z: 0.04333779} --- !u!195 &-3946116891922048263 NavMeshAgent: m_ObjectHideFlags: 0 @@ -395,7 +395,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -404,7 +404,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-6822573781794617403 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Rabby_Queen_White.prefab b/Assets/Res_Addr/Pet/Rabby_Queen_White.prefab index 328002562..e3018a33e 100644 --- a/Assets/Res_Addr/Pet/Rabby_Queen_White.prefab +++ b/Assets/Res_Addr/Pet/Rabby_Queen_White.prefab @@ -31,7 +31,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6733014878611826211} @@ -97,8 +97,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.6278597, y: 0.44382071, z: 0.54496074} - m_Center: {x: 0, y: 0.21872303, z: -0.03525284} + m_Size: {x: 0.94178957, y: 0.6657311, z: 0.8174411} + m_Center: {x: 0, y: 0.32808453, z: -0.052879248} --- !u!195 &-4541332670138130057 NavMeshAgent: m_ObjectHideFlags: 0 @@ -111,7 +111,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -120,7 +120,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-536791711978738455 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Racco_B.prefab b/Assets/Res_Addr/Pet/Racco_B.prefab index 4b4946b24..3dd3a0e61 100644 --- a/Assets/Res_Addr/Pet/Racco_B.prefab +++ b/Assets/Res_Addr/Pet/Racco_B.prefab @@ -382,7 +382,7 @@ Transform: 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_LocalScale: {x: 1.7, y: 1.7, z: 1.7} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3727127712147571379} @@ -448,8 +448,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.589455, y: 0.58225346, z: 0.76175857} - m_Center: {x: -0.06264505, y: 0.29136622, z: -0.18109606} + m_Size: {x: 1.0020734, y: 0.9898308, z: 1.2949896} + m_Center: {x: -0.10649657, y: 0.49532253, z: -0.30786332} --- !u!195 &-9046067891991078218 NavMeshAgent: m_ObjectHideFlags: 0 @@ -462,7 +462,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -471,7 +471,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &9022518901904869699 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Scarabro_A.prefab b/Assets/Res_Addr/Pet/Scarabro_A.prefab index b5b91b714..114193e3f 100644 --- a/Assets/Res_Addr/Pet/Scarabro_A.prefab +++ b/Assets/Res_Addr/Pet/Scarabro_A.prefab @@ -361,7 +361,7 @@ Transform: 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_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 829858703307103135} @@ -427,8 +427,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.37029934, y: 0.17879514, z: 0.37103826} - m_Center: {x: -0.0000067278743, y: 0.07295476, z: 0.0057458505} + m_Size: {x: 0.7405987, y: 0.3575903, z: 0.7420765} + m_Center: {x: -0.000013455749, y: 0.14590952, z: 0.011491701} --- !u!195 &5271386557474417234 NavMeshAgent: m_ObjectHideFlags: 0 @@ -441,7 +441,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -450,7 +450,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-9189398131220373188 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Scopionto_A.prefab b/Assets/Res_Addr/Pet/Scopionto_A.prefab index 5558c3702..5a77c3d2e 100644 --- a/Assets/Res_Addr/Pet/Scopionto_A.prefab +++ b/Assets/Res_Addr/Pet/Scopionto_A.prefab @@ -526,7 +526,7 @@ Transform: 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_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1963759820391381162} @@ -592,8 +592,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.1633308, y: 0.28958228, z: 0.27899152} - m_Center: {x: 0.000020503998, y: 0.082873575, z: -0.011667248} + m_Size: {x: 0.6533232, y: 1.1583291, z: 1.1159661} + m_Center: {x: 0.00008201599, y: 0.3314943, z: -0.04666899} --- !u!195 &3785700290662975964 NavMeshAgent: m_ObjectHideFlags: 0 @@ -606,7 +606,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -615,7 +615,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &2042670394627119234 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Snailo_C.prefab b/Assets/Res_Addr/Pet/Snailo_C.prefab index 98ef37f83..711137da7 100644 --- a/Assets/Res_Addr/Pet/Snailo_C.prefab +++ b/Assets/Res_Addr/Pet/Snailo_C.prefab @@ -351,7 +351,7 @@ Transform: 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8055354649653305030} @@ -417,8 +417,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.3186365, y: 0.50191224, z: 0.64485765} - m_Center: {x: 0, y: 0.20093516, z: 0.059404865} + m_Size: {x: 0.47795475, y: 0.7528684, z: 0.96728647} + m_Center: {x: 0, y: 0.30140275, z: 0.0891073} --- !u!195 &5758858977714868222 NavMeshAgent: m_ObjectHideFlags: 0 @@ -431,7 +431,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -440,7 +440,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &5473252774881175348 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Squif_B.prefab b/Assets/Res_Addr/Pet/Squif_B.prefab index f5606a292..e56a67dd9 100644 --- a/Assets/Res_Addr/Pet/Squif_B.prefab +++ b/Assets/Res_Addr/Pet/Squif_B.prefab @@ -319,7 +319,7 @@ Transform: 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_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6634949754796182653} @@ -385,8 +385,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.09494361, y: 0.3134731, z: 0.30963668} - m_Center: {x: -0.000000007450581, y: 0.08679974, z: -0.041444387} + m_Size: {x: 0.37977445, y: 1.2538924, z: 1.2385467} + m_Center: {x: -0.000000029802322, y: 0.34719896, z: -0.16577755} --- !u!195 &2020983750727584627 NavMeshAgent: m_ObjectHideFlags: 0 @@ -399,7 +399,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -408,7 +408,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &8070406477789142182 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Teruru_A.prefab b/Assets/Res_Addr/Pet/Teruru_A.prefab index e7cf527cc..66d53c92d 100644 --- a/Assets/Res_Addr/Pet/Teruru_A.prefab +++ b/Assets/Res_Addr/Pet/Teruru_A.prefab @@ -289,7 +289,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6281667854429243976} @@ -355,8 +355,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.38815808, y: 0.47884125, z: 0.388158} - m_Center: {x: -0.000000022351742, y: 0.27845868, z: 0} + m_Size: {x: 0.5046055, y: 0.6224935, z: 0.50460535} + m_Center: {x: -0.000000038743018, y: 0.36199623, z: -0.000000009685754} --- !u!195 &8489190756923713065 NavMeshAgent: m_ObjectHideFlags: 0 @@ -369,7 +369,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -378,7 +378,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &5785857745234981365 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Teruru_Ba.prefab b/Assets/Res_Addr/Pet/Teruru_Ba.prefab index 6cdf6b60e..2048fb167 100644 --- a/Assets/Res_Addr/Pet/Teruru_Ba.prefab +++ b/Assets/Res_Addr/Pet/Teruru_Ba.prefab @@ -282,7 +282,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3210320954273607337} @@ -348,8 +348,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.41942737, y: 0.47884125, z: 0.388158} - m_Center: {x: 0.000000014901161, y: 0.27845868, z: 0} + m_Size: {x: 0.54525554, y: 0.6224935, z: 0.50460535} + m_Center: {x: 0.000000019371509, y: 0.36199623, z: -0.000000009685754} --- !u!195 &-3778627251510357033 NavMeshAgent: m_ObjectHideFlags: 0 @@ -362,7 +362,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -371,7 +371,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-1577882325920835360 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Turnipa_Sweet.prefab b/Assets/Res_Addr/Pet/Turnipa_Sweet.prefab index 5d8a114da..9093f66ed 100644 --- a/Assets/Res_Addr/Pet/Turnipa_Sweet.prefab +++ b/Assets/Res_Addr/Pet/Turnipa_Sweet.prefab @@ -510,7 +510,7 @@ Transform: 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_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1319869897745657584} @@ -576,8 +576,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.1961377, y: 1.9460857, z: 1.129811} - m_Center: {x: 0.11492899, y: 0.7304785, z: 0} + m_Size: {x: 1.3176826, y: 1.1676514, z: 0.6778866} + m_Center: {x: 0.068957396, y: 0.43828705, z: 0} --- !u!195 &-7554647507427113126 NavMeshAgent: m_ObjectHideFlags: 0 @@ -590,7 +590,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -599,7 +599,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &6712863568933893298 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Pet/Whispa_B.prefab b/Assets/Res_Addr/Pet/Whispa_B.prefab index de8668d23..8d832c2e9 100644 --- a/Assets/Res_Addr/Pet/Whispa_B.prefab +++ b/Assets/Res_Addr/Pet/Whispa_B.prefab @@ -31,7 +31,7 @@ Transform: 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_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3310646694559533416} @@ -97,8 +97,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.39076793, y: 0.48332545, z: 0.3885091} - m_Center: {x: 0.0028171316, y: 0.33192968, z: -0.0015746355} + m_Size: {x: 0.5079983, y: 0.6283231, z: 0.5050618} + m_Center: {x: 0.003662271, y: 0.43150854, z: -0.002047026} --- !u!195 &427877112764281631 NavMeshAgent: m_ObjectHideFlags: 0 @@ -111,7 +111,7 @@ NavMeshAgent: m_Radius: 0.25 m_Speed: 4.5 m_Acceleration: 140 - avoidancePriority: 51 + avoidancePriority: 30 m_AngularSpeed: 300 m_StoppingDistance: 0.1 m_AutoTraverseOffMeshLink: 1 @@ -120,7 +120,7 @@ NavMeshAgent: m_Height: 2 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 1 --- !u!54 &-3822657672713955368 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Table/Pet/table_petlist.cs b/Assets/Script/Table/Pet/table_petlist.cs index ac013cc69..b3d3d2549 100644 --- a/Assets/Script/Table/Pet/table_petlist.cs +++ b/Assets/Script/Table/Pet/table_petlist.cs @@ -111,22 +111,9 @@ public class PetListTableData : TableDataBase // 펫 3D 프리팹 public string s_PetPrefab { get; set; } - // 펫 기본 크기 보정값 - ObscuredFloat _Scale; - public float f_Scale - { - get { return _Scale; } - set { _Scale = value; _Scale.RandomizeCryptoKey(); } - } - - // 펫 UI 크기 보정값 - ObscuredFloat _UIScale; - public float f_UIScale - { - get { return _UIScale; } - set { _UIScale = value; _UIScale.RandomizeCryptoKey(); } - } - + public float f_Scale; + public float f_UIScale; + public float f_UIOffSet_y; public override string Get_Name() { return table_itemlist.Ins.Get_ItemName(n_PetID); } public string Get_Desc() { return table_itemlist.Ins.Get_ItemDesc(n_PetID); } diff --git a/Assets/Script/UI/Pet/PetUI_Left.cs b/Assets/Script/UI/Pet/PetUI_Left.cs index 5a304a486..bfefa3162 100644 --- a/Assets/Script/UI/Pet/PetUI_Left.cs +++ b/Assets/Script/UI/Pet/PetUI_Left.cs @@ -29,6 +29,7 @@ public class PetUI_Left : UI3DModel Set_3DModel(false, m_Data.s_PetPrefab, tf => { tf.localScale = Vector3.one * m_Data.f_UIScale; + tf.localPosition = Vector3.up * m_Data.f_UIOffSet_y; zSizeControler.Set(tf); }); //images[0].sprite = UIAtlasMgr.Ins.Get_GradeSprite(m_Data.n_PetGrade);