Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

GameConfig/CFG.check

@@ -1,4 +1,4 @@
-D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-2082997215
+D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:2005108034
 D:\git\newWork\Config\GameConfig\M_monster.xls:-1264817717
 D:\git\newWork\Config\GameConfig\M_i18n.xls:-2088143900
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:821085365

protocol/ws_index_request.proto

@@ -13,4 +13,22 @@ import "ws_common_request.proto";
 message IndexDataRequest {
     optional WsMessageType message_id = 1 [default = INDEX_DATA];     // 消息类型 获取首页数据
     repeated CommonRequest envelope = 2;     // 公共必传参数集
-} 
+}
+
+
+// 首页数据响应
+message IndexPageDataResponse {
+    repeated UnclaimedMagicStoneEntry unclaimed_magic_stone_map = 1; // 未领取魔法石映射
+    optional StoryEntry storyEntry = 2;   //闯关模式数据
+    optional int32 maxMagicArrayLevel=3;   //当前拥有的魔法阵最大等级
+}
+
+message UnclaimedMagicStoneEntry {
+    optional string key = 1;
+    optional int64 value = 2;
+}
+
+message StoryEntry{
+    optional int64 story_id = 1;       // 闯关模式当前关卡
+    optional int64 story_ticket = 2;   // 挑战券数量
+}