fix spawn command

YYLMZXC · Dec 28, 2022 · c58c741 · c58c741
1 parent 495364c
commit c58c741
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/src/game_data.cpp b/src/game_data.cpp
@@ -44,6 +44,11 @@ namespace exceloutput {
 	std::unordered_map<int, ShopGoodsData> shop_goods_datas;
 	std::unordered_map<int, TalentSkillData> talent_skill_datas;
 	std::unordered_map<int, GadgetData> gadget_datas;
+	std::unordered_map<int, GadgetData_Level> gadget_level_datas;
+	std::unordered_map<int, GadgetData_Monster> gadget_monster_datas;
+	std::unordered_map<int, GadgetData_Avatar> gadget_avatar_datas;
+	std::unordered_map<int, GadgetData_Equip> gadget_equip_datas;
+	std::unordered_map<int, GadgetPropData> gadget_prop_datas;
 	std::unordered_map<int, MonsterData> monster_datas;
 	std::unordered_map<int, NpcData> npc_datas;
 	std::unordered_map<int, SceneData> scene_datas;
@@ -324,6 +329,35 @@ bool load_game_data() {
 	load_gadgets("resources/exceloutput/GadgetData_Monster.tsv");
 	load_gadgets("resources/exceloutput/GadgetData_Equip.tsv");
 
+
+	// GadgetData_Level
+	load_excel<exceloutput::GadgetData_Level>("resources/exceloutput/GadgetData_Level.tsv", &exceloutput::gadget_level_datas, "ID", [](exceloutput::GadgetData_Level* gadget_level, Excel* excel) {
+		gadget_level->default_camp = excel->get_int("默认阵营");
+	gadget_level->is_interactive = (bool)excel->get_int("能否交互");
+		});
+
+	// GadgetData_Monster
+	load_excel<exceloutput::GadgetData_Monster>("resources/exceloutput/GadgetData_Monster.tsv", &exceloutput::gadget_monster_datas, "ID", [](exceloutput::GadgetData_Monster* gadget_monster, Excel* excel) {
+		gadget_monster->default_camp = excel->get_int("默认阵营");
+	gadget_monster->is_interactive = (bool)excel->get_int("能否交互");
+		});
+
+	// GadgetData_Avatar
+	load_excel<exceloutput::GadgetData_Avatar>("resources/exceloutput/GadgetData_Avatar.tsv", &exceloutput::gadget_avatar_datas, "ID", [](exceloutput::GadgetData_Avatar* gadget_avatar, Excel* excel) {
+		gadget_avatar->default_camp = excel->get_int("默认阵营");
+	gadget_avatar->is_interactive = (bool)excel->get_int("能否交互");
+		});
+
+	// GadgetData_Equip
+	load_excel<exceloutput::GadgetData_Equip>("resources/exceloutput/GadgetData_Equip.tsv", &exceloutput::gadget_equip_datas, "ID", [](exceloutput::GadgetData_Equip* gadget_equip, Excel* excel) {
+		gadget_equip->default_camp = excel->get_int("默认阵营");
+	gadget_equip->is_interactive = (bool)excel->get_int("能否交互");
+		});
+
+	// GadgetPropData
+	load_excel<exceloutput::GadgetPropData>("resources/exceloutput/GadgetPropData.tsv", &exceloutput::gadget_prop_datas, "ID", [](exceloutput::GadgetPropData* gadgetprop, Excel* excel) {
+		});
+
 	// MonsterData
 	load_excel<exceloutput::MonsterData>("resources/exceloutput/MonsterData.tsv", &exceloutput::monster_datas, "ID", [](exceloutput::MonsterData *monster, const Excel *excel) {
 		monster->equip_1 = excel->get_int("装备1");

diff --git a/src/game_data.hpp b/src/game_data.hpp
@@ -84,6 +84,34 @@ struct GadgetData {
 	EntityType entity_type; //类型
 };
 
+struct GadgetData_Level {
+	int id = 0; //ID
+	int default_camp = 0; //默认阵营
+	bool is_interactive = false; //能否交互
+};
+
+struct GadgetData_Monster {
+	int id = 0; //ID
+	int default_camp = 0; //默认阵营
+	bool is_interactive = false; //能否交互
+};
+
+struct GadgetData_Avatar {
+	int id = 0; //ID
+	int default_camp = 0; //默认阵营
+	bool is_interactive = false; //能否交互
+};
+
+struct GadgetData_Equip {
+	int id = 0; //ID
+	int default_camp = 0; //默认阵营
+	bool is_interactive = false; //能否交互
+};
+
+struct GadgetPropData {
+	int id = 0; //ID
+};
+
 struct MonsterData {
 	int id; //ID
 	int equip_1; //装备1
@@ -113,6 +141,11 @@ extern std::unordered_map<int, ShopPlanData> shop_plan_datas;
 extern std::unordered_map<int, ShopGoodsData> shop_goods_datas;
 extern std::unordered_map<int, TalentSkillData> talent_skill_datas;
 extern std::unordered_map<int, GadgetData> gadget_datas;
+extern std::unordered_map<int, GadgetData_Level> gadget_level_datas;
+extern std::unordered_map<int, GadgetData_Monster> gadget_monster_datas;
+extern std::unordered_map<int, GadgetData_Avatar> gadget_avatar_datas;
+extern std::unordered_map<int, GadgetData_Equip> gadget_equip_datas;
+extern std::unordered_map<int, GadgetPropData> gadget_prop_datas;
 extern std::unordered_map<int, MonsterData> monster_datas;
 extern std::unordered_map<int, NpcData> npc_datas;
 extern std::unordered_map<int, SceneData> scene_datas;