Merge remote-tracking branch 'origin/develop' into develop

GameConfig/CFG.check

@@ -1,17 +1,17 @@
-D:\project\FishConfig\GameConfig\M_un_lock_battle.xls:84348074
-D:\project\FishConfig\GameConfig\M_game_battle_field.xls:-1668593709
-D:\project\FishConfig\GameConfig\M_Global_Config.xls:-729848354
-D:\project\FishConfig\GameConfig\M_skill.xls:1915571819
-D:\project\FishConfig\GameConfig\M_item.xls:2021392483
-D:\project\FishConfig\GameConfig\M_magic_array_config.xls:-124973679
-D:\project\FishConfig\GameConfig\M_shop.xls:-598498963
-D:\project\FishConfig\GameConfig\M_i18n.xls:1797769440
-D:\project\FishConfig\GameConfig\M_test.xls:444037689
-D:\project\FishConfig\GameConfig\M_equipment.xls:32694818
-D:\project\FishConfig\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\project\FishConfig\GameConfig\M_everyday_task.xls:949185213
-D:\project\FishConfig\GameConfig\M_hero.xls:-182339952
-D:\project\FishConfig\GameConfig\M_game_level_config.xls:-610292667
-D:\project\FishConfig\GameConfig\M_monster.xls:-1235680395
-D:\project\FishConfig\GameConfig\M_fish_scheme.xls:435403286
-D:\project\FishConfig\GameConfig\M_vip_config.xls:1878630432
+D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1668593709
+D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
+D:\git\newWork\Config\GameConfig\M_i18n.xls:1797769440
+D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
+D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
+D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
+D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
+D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-610292667
+D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
+D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
+D:\git\newWork\Config\GameConfig\M_item.xls:2021392483
+D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
+D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821
+D:\git\newWork\Config\GameConfig\M_hero.xls:-182339952
+D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
+D:\git\newWork\Config\GameConfig\M_skill.xls:1915571819
+D:\git\newWork\Config\GameConfig\M_test.xls:444037689

GameConfig/Code/Client/M_item.h

@@ -4,17 +4,17 @@ struct M_itemData
 {
 	//ID
 	int mID;
-	//��Ʒ����
+	//ÎïÆ·Ãû³Æ
 	std::string mname;
-	//����
+	//ÃèÊö
 	std::string mdesc;
-	//����
+	//ÀàÐÍ
 	int mtype;
-	//Ʒ��
+	//Æ·ÖÊ
 	int mquality;
-	//ͼ��
+	//ͼ±ê
 	std::string micon;
-	//����
+	//²ÎÊý
 	std::string mparam1;
 };
 

GameConfig/Code/Client/M_skill.h

@@ -4,19 +4,19 @@ struct M_skillData
 {
 	//ID
 	int mID;
-	//英锟斤拷ID
+	//英雄ID
 	int mhero_id;
-	//锟斤拷锟杰等硷拷
+	//技能等级
 	int mskill_leve;
-	//锟接碉拷锟斤拷锟斤拷
+	//子弹数量
 	int mbullet_num;
-	//锟接碉拷锟诫径
+	//子弹半径
 	int mbullet_radius;
-	//锟斤拷锟斤拷锟斤拷锟斤拷
+	//攻击距离
 	int mattack_distance;
-	//锟斤拷锟斤拷锟斤拷锟�
+	//攻击间隔
 	float mattack_Interval;
-	//锟斤拷锟斤拷锟斤拷锟斤拷
+	//技能描述
 	std::string mskill_des;
 };
 

GameConfig/Code/Server/M_item.h

@@ -5,17 +5,17 @@ struct M_itemData
 {
 	//ID
 	int mID;
-	//��Ʒ����
+	//ÎïÆ·Ãû³Æ
 	std::string mname;
-	//����
+	//ÃèÊö
 	std::string mdesc;
-	//����
+	//ÀàÐÍ
 	int mtype;
-	//Ʒ��
+	//Æ·ÖÊ
 	int mquality;
-	//ͼ��
+	//ͼ±ê
 	std::string micon;
-	//����
+	//²ÎÊý
 	std::string mparam1;
 };
 

GameConfig/Code/Server/M_skill.h

@@ -5,19 +5,19 @@ struct M_skillData
 {
 	//ID
 	int mID;
-	//英锟斤拷ID
+	//英雄ID
 	int mhero_id;
-	//锟斤拷锟杰等硷拷
+	//技能等级
 	int mskill_leve;
-	//锟接碉拷锟斤拷锟斤拷
+	//子弹数量
 	int mbullet_num;
-	//锟接碉拷锟诫径
+	//子弹半径
 	int mbullet_radius;
-	//锟斤拷锟斤拷锟斤拷锟斤拷
+	//攻击距离
 	int mattack_distance;
-	//锟斤拷锟斤拷锟斤拷锟�
+	//攻击间隔
 	float mattack_Interval;
-	//锟斤拷锟斤拷锟斤拷锟斤拷
+	//技能描述
 	std::string mskill_des;
 };