diff --git a/Assets/ResWork/Table/Export/MonsterAppear.json b/Assets/ResWork/Table/Export/MonsterAppear.json index a99b957b5..528731d38 100644 --- a/Assets/ResWork/Table/Export/MonsterAppear.json +++ b/Assets/ResWork/Table/Export/MonsterAppear.json @@ -1 +1 @@ -[{"n_SpawnerID": "1", "n_AppearMonsterLv": "1", "n_MonsterATK": "1", "n_MonsterDEF": "-10", "n_MonsterMDEF": "-10", "n_MonsterHP": "100000", "s_AppearMonster": "101|102|103|104", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "15", "f_PatrolRange": "10", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "9700001"}, {"n_SpawnerID": "2", "n_AppearMonsterLv": "2", "n_MonsterATK": "2", "n_MonsterDEF": "2", "n_MonsterMDEF": "2", "n_MonsterHP": "2", "s_AppearMonster": "105|106|107", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.8", "n_MaxMonsterCount": "10", "f_PatrolRange": "4", "n_DropExp": "15", "n_DropGold": "2", "n_DropReward": "9700001"}, {"n_SpawnerID": "3", "n_AppearMonsterLv": "3", "n_MonsterATK": "3", "n_MonsterDEF": "3", "n_MonsterMDEF": "3", "n_MonsterHP": "50", "s_AppearMonster": "1014|1015", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.6", "n_MaxMonsterCount": "10", "f_PatrolRange": "5", "n_DropExp": "20", "n_DropGold": "3", "n_DropReward": "9700001"}, {"n_SpawnerID": "4", "n_AppearMonsterLv": "4", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "111|112|113", "e_SpawnerType": "PhaseAllKill", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "5", "n_AppearMonsterLv": "5", "n_MonsterATK": "5", "n_MonsterDEF": "1", "n_MonsterMDEF": "1", "n_MonsterHP": "100", "s_AppearMonster": "114|115|116|117", "e_SpawnerType": "Phase", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "10", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "9700001"}, {"n_SpawnerID": "6", "n_AppearMonsterLv": "6", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "118|119|120", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "7", "n_AppearMonsterLv": "7", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "121|122|123", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "8", "n_AppearMonsterLv": "8", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "124|125|126|127|128", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "9", "n_AppearMonsterLv": "9", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "129|130|131|132|133", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "10", "n_AppearMonsterLv": "10", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "134|135|136", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "11", "n_AppearMonsterLv": "11", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "137|138|139|140", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "12", "n_AppearMonsterLv": "12", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "141|142|143|144|145", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "13", "n_AppearMonsterLv": "13", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "70", "s_AppearMonster": "146|147|148|149|150|151|152|153|154", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "14", "n_AppearMonsterLv": "14", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "155|156|157", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "15", "n_AppearMonsterLv": "15", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "158|159|160", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "16", "n_AppearMonsterLv": "16", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "161|162|163|164", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "17", "n_AppearMonsterLv": "17", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "165|166|167", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "18", "n_AppearMonsterLv": "18", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "168|169|170|171|172", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "19", "n_AppearMonsterLv": "19", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "173|174|175", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "20", "n_AppearMonsterLv": "20", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "176|177|178|179|180|181", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "21", "n_AppearMonsterLv": "21", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "182|183|184|185|186", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "22", "n_AppearMonsterLv": "22", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "187|188|189|190|191", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "23", "n_AppearMonsterLv": "23", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "192|193|194|195|196|197", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "24", "n_AppearMonsterLv": "24", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "198|199|200|201|202|203", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "25", "n_AppearMonsterLv": "25", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "204|205|206|207|208|209|210", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "26", "n_AppearMonsterLv": "26", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "211|212|213|214|215|216|217|218", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "27", "n_AppearMonsterLv": "27", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "219|220|221|222|223|224|225", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "28", "n_AppearMonsterLv": "28", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "226|227|228|229|230|231|232", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "29", "n_AppearMonsterLv": "29", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "233|234|235|236|237|238|239", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "30", "n_AppearMonsterLv": "30", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "240|241|242|243|244|245|246", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "31", "n_AppearMonsterLv": "31", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "247|248|249|250", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "32", "n_AppearMonsterLv": "32", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "251|252|253|254|255|256|257|258|259", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "33", "n_AppearMonsterLv": "33", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "260|261|262|263|264|265|266", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "34", "n_AppearMonsterLv": "34", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "267|268|269|270|271|272|273", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "35", "n_AppearMonsterLv": "35", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "274|275|276|277|278|279|280|281", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "36", "n_AppearMonsterLv": "36", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "282|283|284|285|286|287|288|289|290", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "37", "n_AppearMonsterLv": "37", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "291|292|293|294|295|296|297|298", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "38", "n_AppearMonsterLv": "38", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "299|300|301|302|303|304", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "39", "n_AppearMonsterLv": "39", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "305|306|307|308|309|310|311", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "40", "n_AppearMonsterLv": "40", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "312|313|314|315|316|317|318|319", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "41", "n_AppearMonsterLv": "41", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "320|321|322|323", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "42", "n_AppearMonsterLv": "42", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "324|325|326|327|328|329|330|331|332", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "40", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "43", "n_AppearMonsterLv": "43", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "333|334|335|336|337|338|339|340|341|342|343|344", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "40", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "44", "n_AppearMonsterLv": "44", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "345|346|347", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "45", "n_AppearMonsterLv": "45", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "2000", "s_AppearMonster": "348|349|350|351", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "46", "n_AppearMonsterLv": "46", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "3000", "s_AppearMonster": "1031", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "1", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}] \ No newline at end of file +[{"n_SpawnerID": "1", "n_AppearMonsterLv": "1", "n_MonsterATK": "1", "n_MonsterDEF": "-10", "n_MonsterMDEF": "-10", "n_MonsterHP": "100000", "s_AppearMonster": "101|102|103|104", "e_SpawnerType": "Random", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "15", "f_PatrolRange": "10", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "9700001"}, {"n_SpawnerID": "2", "n_AppearMonsterLv": "2", "n_MonsterATK": "999999", "n_MonsterDEF": "2", "n_MonsterMDEF": "2", "n_MonsterHP": "99999", "s_AppearMonster": "105|106|107", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.8", "n_MaxMonsterCount": "10", "f_PatrolRange": "4", "n_DropExp": "15", "n_DropGold": "2", "n_DropReward": "9700001"}, {"n_SpawnerID": "3", "n_AppearMonsterLv": "3", "n_MonsterATK": "3", "n_MonsterDEF": "3", "n_MonsterMDEF": "3", "n_MonsterHP": "50", "s_AppearMonster": "1014|1015", "e_SpawnerType": "Order", "f_SpawnerDelay": "3.6", "n_MaxMonsterCount": "10", "f_PatrolRange": "5", "n_DropExp": "20", "n_DropGold": "3", "n_DropReward": "9700001"}, {"n_SpawnerID": "4", "n_AppearMonsterLv": "4", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "111|112|113", "e_SpawnerType": "PhaseAllKill", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "5", "n_AppearMonsterLv": "5", "n_MonsterATK": "5", "n_MonsterDEF": "1", "n_MonsterMDEF": "1", "n_MonsterHP": "100", "s_AppearMonster": "114|115|116|117", "e_SpawnerType": "Phase", "f_SpawnerDelay": "4", "n_MaxMonsterCount": "10", "f_PatrolRange": "3", "n_DropExp": "10", "n_DropGold": "1", "n_DropReward": "9700001"}, {"n_SpawnerID": "6", "n_AppearMonsterLv": "6", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "118|119|120", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "7", "n_AppearMonsterLv": "7", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "121|122|123", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "8", "n_AppearMonsterLv": "8", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "124|125|126|127|128", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "9", "n_AppearMonsterLv": "9", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "129|130|131|132|133", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "10", "n_AppearMonsterLv": "10", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "134|135|136", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "11", "n_AppearMonsterLv": "11", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "137|138|139|140", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "12", "n_AppearMonsterLv": "12", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "141|142|143|144|145", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "13", "n_AppearMonsterLv": "13", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "70", "s_AppearMonster": "146|147|148|149|150|151|152|153|154", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "14", "n_AppearMonsterLv": "14", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "155|156|157", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "15", "n_AppearMonsterLv": "15", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "158|159|160", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "5", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "16", "n_AppearMonsterLv": "16", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "161|162|163|164", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "17", "n_AppearMonsterLv": "17", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "165|166|167", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "18", "n_AppearMonsterLv": "18", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "168|169|170|171|172", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "19", "n_AppearMonsterLv": "19", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "173|174|175", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "20", "n_AppearMonsterLv": "20", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "176|177|178|179|180|181", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "21", "n_AppearMonsterLv": "21", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "182|183|184|185|186", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "22", "n_AppearMonsterLv": "22", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "187|188|189|190|191", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "23", "n_AppearMonsterLv": "23", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "192|193|194|195|196|197", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "24", "n_AppearMonsterLv": "24", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "198|199|200|201|202|203", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "20", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "25", "n_AppearMonsterLv": "25", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "204|205|206|207|208|209|210", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "26", "n_AppearMonsterLv": "26", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "211|212|213|214|215|216|217|218", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "27", "n_AppearMonsterLv": "27", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "219|220|221|222|223|224|225", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "28", "n_AppearMonsterLv": "28", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "226|227|228|229|230|231|232", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "29", "n_AppearMonsterLv": "29", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "233|234|235|236|237|238|239", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "30", "n_AppearMonsterLv": "30", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "240|241|242|243|244|245|246", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "31", "n_AppearMonsterLv": "31", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "247|248|249|250", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "32", "n_AppearMonsterLv": "32", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "251|252|253|254|255|256|257|258|259", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "33", "n_AppearMonsterLv": "33", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "260|261|262|263|264|265|266", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "34", "n_AppearMonsterLv": "34", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "267|268|269|270|271|272|273", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "25", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "35", "n_AppearMonsterLv": "35", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "274|275|276|277|278|279|280|281", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "36", "n_AppearMonsterLv": "36", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "282|283|284|285|286|287|288|289|290", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "37", "n_AppearMonsterLv": "37", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "291|292|293|294|295|296|297|298", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "38", "n_AppearMonsterLv": "38", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "299|300|301|302|303|304", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "39", "n_AppearMonsterLv": "39", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "305|306|307|308|309|310|311", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "40", "n_AppearMonsterLv": "40", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "312|313|314|315|316|317|318|319", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "30", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "41", "n_AppearMonsterLv": "41", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "320|321|322|323", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "42", "n_AppearMonsterLv": "42", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "324|325|326|327|328|329|330|331|332", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "40", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "43", "n_AppearMonsterLv": "43", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "333|334|335|336|337|338|339|340|341|342|343|344", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "40", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "44", "n_AppearMonsterLv": "44", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "4", "s_AppearMonster": "345|346|347", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "10", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "45", "n_AppearMonsterLv": "45", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "2000", "s_AppearMonster": "348|349|350|351", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "15", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}, {"n_SpawnerID": "46", "n_AppearMonsterLv": "46", "n_MonsterATK": "4", "n_MonsterDEF": "4", "n_MonsterMDEF": "4", "n_MonsterHP": "3000", "s_AppearMonster": "1031", "e_SpawnerType": "Random", "f_SpawnerDelay": "3.4", "n_MaxMonsterCount": "1", "f_PatrolRange": "6", "n_DropExp": "25", "n_DropGold": "4", "n_DropReward": "9700001"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 6a33b13b8..943ff2b5b 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Summon/Hourglass A.prefab b/Assets/Res_Addr/Summon/Hourglass A.prefab index 5b86b78c0..aae0dbd4c 100644 --- a/Assets/Res_Addr/Summon/Hourglass A.prefab +++ b/Assets/Res_Addr/Summon/Hourglass A.prefab @@ -232,6 +232,7 @@ MonoBehaviour: m_animation: {fileID: 0} _target: {fileID: 0} isTarget: 0 + m_HUDUI: {fileID: 0} SummonType: 1 --- !u!65 &3665982464420144749 BoxCollider: @@ -252,8 +253,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8517497, y: 0.5006471, z: 0.4424669} - m_Center: {x: 0, y: 0.25417534, z: 0} + m_Size: {x: 0.8517497, y: 3, z: 0.4424669} + m_Center: {x: 0, y: 1, z: 0} --- !u!195 &6627957360363133212 NavMeshAgent: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Summon/Mega_Golem_A.prefab b/Assets/Res_Addr/Summon/Mega_Golem_A.prefab index 9779d3f75..76568bab0 100644 --- a/Assets/Res_Addr/Summon/Mega_Golem_A.prefab +++ b/Assets/Res_Addr/Summon/Mega_Golem_A.prefab @@ -78,6 +78,7 @@ MonoBehaviour: m_animation: {fileID: 0} _target: {fileID: 0} isTarget: 0 + m_HUDUI: {fileID: 0} SummonType: 0 --- !u!65 &-2765125427909759228 BoxCollider: @@ -98,8 +99,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.7796136, y: 1.7759378, z: 1.7948022} - m_Center: {x: -0.000000061891036, y: 0.3901482, z: 0.26109192} + m_Size: {x: 0.3926459, y: 3, z: 0.3131792} + m_Center: {x: 0.002838105, y: 1, z: 0.048234195} --- !u!195 &1913404697311654592 NavMeshAgent: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index f03e31e73..48a2daa9a 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -506,7 +506,7 @@ public class Actor : MyCoroutine // } // if (camShake) MyValue.m_RealCamera.ShakeCamera(1); //} - MyValue.m_RealCamera.ShakeCamera(1); + if (_dinfo.Beater.IsMainPC()) MyValue.m_RealCamera.ShakeCamera(1); #if UNITY_EDITOR if (SceneManager.GetActiveScene().name == "StatTest") @@ -607,6 +607,7 @@ public class Actor : MyCoroutine if (m_BoxCollider) m_BoxCollider.enabled = false; m_NavMeshAgent.enabled = false; m_IsLockTarget = false; + Del_Target(); Set_Outline(false); } @@ -933,6 +934,7 @@ public class Actor : MyCoroutine if (IsMainPC()) m_Target.Set_Outline(false); } m_Target = null; + isTarget = false; } public bool IsDead() { return DeadStatus || !gameObject.activeInHierarchy; } public bool IsOnlyDead() { return DeadStatus; } diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 9a4f34a16..66a61fc6a 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -482,6 +482,12 @@ public class MobActor : Actor // if (allies[i].Get_Target() == null) // allies[i].Change_Target(false, m_Target, true); } + else + { + var dist1 = DSUtil.Get_Distance(m_Target.Get_position(), Get_position()); + var dist2 = DSUtil.Get_Distance(_dinfo.Beater.Get_position(), Get_position()); + if (dist1 > dist2) Change_Target(false, _dinfo.Beater, true); + } if (m_MonsterTableData.n_PassiveSkillID > 0 && !IsDead()) { diff --git a/Assets/Script/Character/MyActor.cs b/Assets/Script/Character/MyActor.cs index 0f2be75aa..eebad9662 100644 --- a/Assets/Script/Character/MyActor.cs +++ b/Assets/Script/Character/MyActor.cs @@ -4,6 +4,7 @@ public class MyActor : Actor { protected float f_FindEnemyRange; protected Actor OwnerActor; + protected bool isFollowOwner; public override void Set_Target(bool forcefind = false) { @@ -47,6 +48,15 @@ public class MyActor : Actor } if (IsStop || IsCC() || (GameUI.Ins && GameUI.Ins.IngameUI.Active_SelectSkillUI())) return; + if (isFollowOwner) + { + if (Complete_Destination()) + { + Play_Idle(); + isFollowOwner = false; + } + return; + } base.Update(); @@ -113,11 +123,18 @@ public class MyActor : Actor } protected void Follow_PC() { - m_NavMeshAgent.stoppingDistance = 1f; - Play_Run(); - Set_Path(OwnerActor.Get_position()); - if (Complete_Destination()) - Play_Idle(); + if (isFollowOwner) + { + + } + else + { + isFollowOwner = true; + Del_Target(true); + m_NavMeshAgent.stoppingDistance = 1f; + Play_Run(); + Set_Path(OwnerActor.Get_position()); + } } bool IsNotPC() { return !IsRole(eRole.PC); } @@ -127,7 +144,13 @@ public class MyActor : Actor base.Get_Damage(_dinfo); if (!isTarget || m_Target.IsDead()) { - m_Target = _dinfo.Beater; + Change_Target(false, _dinfo.Beater, true); + } + else + { + var dist1 = DSUtil.Get_Distance(m_Target.Get_position(), Get_position()); + var dist2 = DSUtil.Get_Distance(_dinfo.Beater.Get_position(), Get_position()); + if (dist1 > dist2) Change_Target(false, _dinfo.Beater, true); } } diff --git a/Assets/Script/Character/PC/SummonActor.cs b/Assets/Script/Character/PC/SummonActor.cs index 1858cabf1..78b985016 100644 --- a/Assets/Script/Character/PC/SummonActor.cs +++ b/Assets/Script/Character/PC/SummonActor.cs @@ -15,6 +15,7 @@ public class SummonActor : MyActor gameObject.SetActive(true); OwnerActor = owner; + isFollowOwner = DeadStatus = false; projctile_amount = projctileamount; projctile_amount.RandomizeCryptoKey(); m_Auto = true; MaxLifeTime = LifeTime = _time; @@ -24,10 +25,11 @@ public class SummonActor : MyActor m_Stat.Set_Stat(true, eStat.BaseDmg, m_Stat.Get_Stat(eStat.BaseDmg) * _attackrate); m_Stat.Set_Stat(true, eStat.HP, m_Stat.Get_Stat(eStat.HP) * _hprate); m_NavMeshAgent.speed = owner.Get_MoveSpeed(); + Play_Idle(); Set_Warp(owner.Get_position() + Vector3.forward); f_FindEnemyRange = table_GlobalValue.Ins.Get_Float("f_Pet_FindEnemyRange"); - switch(SummonType) + switch (SummonType) { case eSummon.Golem: m_NavStopDistance = 1.5f; @@ -61,24 +63,20 @@ public class SummonActor : MyActor } #endif + if (IsDead()) return; + if (LifeTime > 0f) { LifeTime -= Time.deltaTime; Get_HUDUI().Set(this, LifeTime / MaxLifeTime); - if (LifeTime <= 0f) - { - Set_Die(); - return; - } } - - if (DSUtil.CheckNull(OwnerActor)) + if (LifeTime <= 0f || DSUtil.CheckNull(OwnerActor)) { - Set_Die(); + End_Summon(); return; } - if (!IsStop && (!isTarget || m_Target.IsDead()) && Vector3.Distance(OwnerActor.Get_position(), Get_position()) > 2) + if (!IsStop && (!isTarget || m_Target.IsDead()) && !DSUtil.WithInDistance(OwnerActor.Get_position(), Get_position(), 2f)) { // 마녀 따라다니기 Follow_PC(); } @@ -89,6 +87,12 @@ public class SummonActor : MyActor Play_Idle(); } + void End_Summon() + { + DeadStatus = true; + Set_Die(); + } + protected override void After_Die() { base.After_Die(); diff --git a/Assets/Script/Character/PetActor.cs b/Assets/Script/Character/PetActor.cs index 7a46b181c..9997fa413 100644 --- a/Assets/Script/Character/PetActor.cs +++ b/Assets/Script/Character/PetActor.cs @@ -49,6 +49,7 @@ public class PetActor : MyActor public override void Set(bool isEnemy, Actor owner, ServerData sdata, int _id, bool _isstop, bool _ui = false) { + isFollowOwner = false; Del_Target(); OwnerActor = owner; m_Role = eRole.Pet; diff --git a/Assets/Script/Util/DSUtil.cs b/Assets/Script/Util/DSUtil.cs index 649fcd23e..c174c98c1 100644 --- a/Assets/Script/Util/DSUtil.cs +++ b/Assets/Script/Util/DSUtil.cs @@ -999,7 +999,8 @@ public static partial class DSUtil public static float Get_SliderValue(float f) { return float.IsNaN(f) ? 0f : f; } - public static bool WithInDistance(Vector3 a, Vector3 b, float dist) { return (a - b).sqrMagnitude <= dist * dist; } + public static bool WithInDistance(Vector3 a, Vector3 b, float dist) { return Get_Distance(a, b) <= dist * dist; } + public static float Get_Distance(Vector3 a, Vector3 b) { return (a - b).sqrMagnitude; } static public List Get_T_List(List lst)