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

GameRes/Battle/BOSS/monster 3007极地武者/3007.atlas

@@ -0,0 +1,83 @@
+
+3007.png
+size: 1173,195
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1123, 79
+  size: 41, 42
+  orig: 41, 42
+  offset: 0, 0
+  index: -1
+10
+  rotate: true
+  xy: 389, 3
+  size: 190, 198
+  orig: 190, 198
+  offset: 0, 0
+  index: -1
+11
+  rotate: false
+  xy: 893, 13
+  size: 148, 74
+  orig: 148, 74
+  offset: 0, 0
+  index: -1
+2
+  rotate: true
+  xy: 1024, 122
+  size: 71, 147
+  orig: 71, 147
+  offset: 0, 0
+  index: -1
+3
+  rotate: true
+  xy: 717, 51
+  size: 142, 136
+  orig: 142, 136
+  offset: 0, 0
+  index: -1
+4
+  rotate: false
+  xy: 2, 26
+  size: 385, 167
+  orig: 385, 167
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 589, 3
+  size: 126, 190
+  orig: 126, 190
+  offset: 0, 0
+  index: -1
+6
+  rotate: false
+  xy: 1043, 3
+  size: 78, 117
+  orig: 78, 127
+  offset: 0, 10
+  index: -1
+7
+  rotate: false
+  xy: 855, 89
+  size: 167, 104
+  orig: 167, 104
+  offset: 0, 0
+  index: -1
+8
+  rotate: true
+  xy: 717, 2
+  size: 47, 86
+  orig: 47, 86
+  offset: 0, 0
+  index: -1
+9
+  rotate: true
+  xy: 805, 2
+  size: 47, 86
+  orig: 57, 86
+  offset: 10, 0
+  index: -1

GameRes/Battle/BOSS/monster 3008贪念巨魔/3008.atlas

@@ -0,0 +1,90 @@
+
+3008.png
+size: 1228,245
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 647, 2
+  size: 131, 138
+  orig: 131, 138
+  offset: 0, 0
+  index: -1
+10
+  rotate: true
+  xy: 893, 19
+  size: 62, 126
+  orig: 62, 126
+  offset: 0, 0
+  index: -1
+11
+  rotate: true
+  xy: 845, 2
+  size: 138, 46
+  orig: 138, 46
+  offset: 0, 0
+  index: -1
+12
+  rotate: false
+  xy: 647, 142
+  size: 256, 101
+  orig: 256, 101
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 2, 22
+  size: 376, 221
+  orig: 376, 221
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 905, 83
+  size: 126, 160
+  orig: 126, 160
+  offset: 0, 0
+  index: -1
+4
+  rotate: false
+  xy: 1033, 93
+  size: 82, 150
+  orig: 82, 150
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 1121, 89
+  size: 105, 154
+  orig: 105, 154
+  offset: 0, 0
+  index: -1
+6
+  rotate: true
+  xy: 380, 12
+  size: 231, 265
+  orig: 231, 265
+  offset: 0, 0
+  index: -1
+7
+  rotate: true
+  xy: 780, 2
+  size: 138, 63
+  orig: 138, 65
+  offset: 0, 0
+  index: -1
+8
+  rotate: false
+  xy: 1121, 7
+  size: 69, 80
+  orig: 69, 83
+  offset: 0, 2
+  index: -1
+9
+  rotate: true
+  xy: 1021, 15
+  size: 66, 98
+  orig: 66, 98
+  offset: 0, 0
+  index: -1

GameRes/Battle/BOSS/monster 3010幽冥巨锤/3010.atlas

@@ -0,0 +1,69 @@
+
+3010.png
+size: 290,633
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 2, 71
+  size: 159, 177
+  orig: 159, 177
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 2, 2
+  size: 139, 67
+  orig: 139, 67
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 181, 168
+  size: 99, 62
+  orig: 99, 62
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 2, 497
+  size: 134, 286
+  orig: 134, 286
+  offset: 0, 0
+  index: -1
+5
+  rotate: true
+  xy: 2, 232
+  size: 152, 226
+  orig: 152, 226
+  offset: 0, 0
+  index: -1
+6
+  rotate: false
+  xy: 181, 6
+  size: 86, 160
+  orig: 86, 160
+  offset: 0, 0
+  index: -1
+7
+  rotate: true
+  xy: 2, 386
+  size: 109, 238
+  orig: 109, 238
+  offset: 0, 0
+  index: -1
+8
+  rotate: true
+  xy: 230, 272
+  size: 112, 56
+  orig: 112, 56
+  offset: 0, 0
+  index: -1
+9
+  rotate: false
+  xy: 242, 434
+  size: 41, 61
+  orig: 41, 61
+  offset: 0, 0
+  index: -1

GameRes/Battle/BOSS/monster_3004地狱三头犬/3004.atlas

@@ -0,0 +1,83 @@
+
+3004.png
+size: 735,311
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 241, 122
+  size: 92, 191
+  orig: 92, 191
+  offset: 0, 0
+  index: -1
+10
+  rotate: true
+  xy: 436, 19
+  size: 119, 135
+  orig: 119, 135
+  offset: 0, 0
+  index: -1
+11
+  rotate: false
+  xy: 2, 227
+  size: 289, 82
+  orig: 289, 82
+  offset: 0, 0
+  index: -1
+2
+  rotate: true
+  xy: 2, 2
+  size: 106, 244
+  orig: 110, 244
+  offset: 0, 0
+  index: -1
+3
+  rotate: true
+  xy: 248, 4
+  size: 116, 186
+  orig: 116, 186
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 293, 216
+  size: 93, 222
+  orig: 93, 222
+  offset: 0, 0
+  index: -1
+5
+  rotate: true
+  xy: 434, 140
+  size: 73, 173
+  orig: 73, 173
+  offset: 0, 0
+  index: -1
+6
+  rotate: true
+  xy: 517, 215
+  size: 94, 213
+  orig: 94, 213
+  offset: 0, 0
+  index: -1
+7
+  rotate: false
+  xy: 2, 110
+  size: 237, 115
+  orig: 237, 115
+  offset: 0, 0
+  index: -1
+8
+  rotate: true
+  xy: 573, 5
+  size: 68, 160
+  orig: 68, 160
+  offset: 0, 0
+  index: -1
+9
+  rotate: true
+  xy: 609, 75
+  size: 138, 115
+  orig: 138, 115
+  offset: 0, 0
+  index: -1

GameRes/Battle/BOSS/monster_3005巨镰天使/3005.atlas

@@ -0,0 +1,97 @@
+
+3005.png
+size: 441,566
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 254, 358
+  size: 106, 165
+  orig: 106, 165
+  offset: 0, 0
+  index: -1
+10
+  rotate: false
+  xy: 189, 11
+  size: 49, 122
+  orig: 49, 122
+  offset: 0, 0
+  index: -1
+11
+  rotate: true
+  xy: 2, 135
+  size: 197, 227
+  orig: 210, 241
+  offset: 6, 6
+  index: -1
+12
+  rotate: false
+  xy: 2, 334
+  size: 250, 230
+  orig: 262, 242
+  offset: 8, 8
+  index: -1
+13
+  rotate: false
+  xy: 283, 23
+  size: 148, 74
+  orig: 148, 74
+  offset: 0, 0
+  index: -1
+2
+  rotate: true
+  xy: 254, 277
+  size: 79, 163
+  orig: 79, 163
+  offset: 0, 0
+  index: -1
+3
+  rotate: false
+  xy: 2, 2
+  size: 60, 131
+  orig: 60, 131
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 231, 142
+  size: 133, 94
+  orig: 133, 94
+  offset: 0, 0
+  index: -1
+5
+  rotate: false
+  xy: 327, 186
+  size: 112, 89
+  orig: 114, 90
+  offset: 0, 1
+  index: -1
+6
+  rotate: false
+  xy: 240, 18
+  size: 41, 122
+  orig: 41, 122
+  offset: 0, 0
+  index: -1
+7
+  rotate: true
+  xy: 64, 5
+  size: 128, 123
+  orig: 128, 123
+  offset: 0, 0
+  index: -1
+8
+  rotate: true
+  xy: 254, 466
+  size: 98, 167
+  orig: 98, 167
+  offset: 0, 0
+  index: -1
+9
+  rotate: true
+  xy: 327, 99
+  size: 85, 108
+  orig: 85, 113
+  offset: 0, 5
+  index: -1

GameRes/Battle/BOSS/monster_3006双斧幽煞/3006.atlas

@@ -0,0 +1,48 @@
+
+3006.png
+size: 498,303
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 355, 2
+  size: 90, 70
+  orig: 90, 70
+  offset: 0, 0
+  index: -1
+2
+  rotate: true
+  xy: 235, 65
+  size: 107, 82
+  orig: 107, 82
+  offset: 0, 0
+  index: -1
+3
+  rotate: true
+  xy: 2, 2
+  size: 170, 231
+  orig: 170, 231
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 2, 174
+  size: 127, 338
+  orig: 128, 338
+  offset: 1, 0
+  index: -1
+5
+  rotate: false
+  xy: 342, 74
+  size: 154, 227
+  orig: 154, 227
+  offset: 0, 0
+  index: -1
+6
+  rotate: false
+  xy: 235, 3
+  size: 118, 60
+  orig: 118, 60
+  offset: 0, 0
+  index: -1

GameRes/Battle/BOSS/monster_3009奶牛魔王/3009.atlas

@@ -0,0 +1,62 @@
+
+3009.png
+size: 1013,174
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 432, 2
+  size: 170, 174
+  orig: 170, 174
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 2, 9
+  size: 428, 163
+  orig: 428, 163
+  offset: 0, 0
+  index: -1
+3
+  rotate: true
+  xy: 608, 47
+  size: 125, 187
+  orig: 125, 187
+  offset: 0, 0
+  index: -1
+4
+  rotate: true
+  xy: 683, 16
+  size: 29, 75
+  orig: 29, 75
+  offset: 0, 0
+  index: -1
+5
+  rotate: true
+  xy: 608, 2
+  size: 43, 73
+  orig: 43, 73
+  offset: 0, 0
+  index: -1
+6
+  rotate: false
+  xy: 797, 74
+  size: 141, 98
+  orig: 141, 98
+  offset: 0, 0
+  index: -1
+7
+  rotate: false
+  xy: 940, 61
+  size: 71, 111
+  orig: 71, 111
+  offset: 0, 0
+  index: -1
+8
+  rotate: false
+  xy: 797, 6
+  size: 130, 66
+  orig: 130, 66
+  offset: 0, 0
+  index: -1

protocol/ws_enter_story_request.proto

@@ -20,5 +20,17 @@ message EnterStoryRequest {
     repeated CommonRequest envelope = 5;     // 公共必传参数集
 }
 
+message EntryStoryResponse{
+    optional int32 story_id=1;      //关卡id
+    optional int32 battle_status=2;  //战斗状态：0-进行中，1-胜利，2-失败
+    repeated StoryAwardItemVo story_award_items=3;  //多个道具
+}
+
+message StoryAwardItemVo{
+    optional int32 item_id=1;  //道具id
+    optional int32 quantity=2; //数量
+
+}
+