PVP：匹配队伍
This commit is contained in:
parent
bd520fa719
commit
c7db4f9047
@ -1,13 +1,13 @@
|
||||
序号,题目类型(1为图形题，2为文字题),题面（文案）,题目（图片）,选项1文字,选项1图,选项2文字,选项2图,选项3文字,选项3图,选项4文字,选项4图,"答案(A-1,B-2,C-3,D-4)","布局方式（1为题干左图，2为题干上长图,，3为文字题布局）"
|
||||
Id,Type,Question,QuestionPic,Option1ext,Option1Pic,Option2Text,Option2Pic,Option3Text,Option3Pic,Option4Text,Option4Pic,Answer,Layout
|
||||
int,int,string,string,string,string,string,string,string,string,string,string,int,int
|
||||
1,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,question_0001,,option_00011,,option_00012,,option_00013,,option_00014,3,2
|
||||
2,1,选择一个替代问号，使两套图形的规律表现出最大的相似性，最适合的是：,question_0002,,option_00021,,option_00022,,option_00023,,option_00024,2,2
|
||||
3,1,能与所给图形组合成立方体的是：,question_0003,,option_00031,,option_00032,,option_00033,,option_00034,3,1
|
||||
4,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,question_0004,,option_00041,,option_00042,,option_00043,,option_00044,4,2
|
||||
5,1,纸盒的外表面中，不能折叠成所示的纸盒的是：,question_0005,,option_00051,,option_00052,,option_00053,,option_00054,2,1
|
||||
6,1,选出最恰当的一个填在问号处，使图形呈现出一定的规律性：,question_0006,,option_00061,,option_00062,,option_00063,,option_00064,3,2
|
||||
7,1,符合立体图形的俯视图和左视图的是：,question_0007,,option_00071,,option_00072,,option_00073,,option_00074,2,1
|
||||
8,1,最符合图形规律的是：,question_0008,,option_00081,,option_00082,,option_00083,,option_00084,4,2
|
||||
9,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,question_0009,,option_00091,,option_00092,,option_00093,,option_00094,2,2
|
||||
10,1,将一个正方体从中间挖去一个圆柱，得到所示的新立体图形，从任意面剖开，哪一个不可能是该立体图形的截面：,question_0010,,option_00101,,option_00102,,option_00103,,option_00104,2,1
|
||||
1,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,1_question,,1_option1,,1_option2,,1_option3,,1_option4,3,2
|
||||
2,1,选择一个替代问号，使两套图形的规律表现出最大的相似性，最适合的是：,2_question,,2_option1,,2_option2,,2_option3,,2_option4,2,2
|
||||
3,1,能与所给图形组合成立方体的是：,3_question,,3_option1,,3_option2,,3_option3,,3_option4,3,1
|
||||
4,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,4_question,,4_option1,,4_option2,,4_option3,,4_option4,4,2
|
||||
5,1,纸盒的外表面中，不能折叠成所示的纸盒的是：,5_question,,5_option1,,5_option2,,5_option3,,5_option4,2,1
|
||||
6,1,选出最恰当的一个填在问号处，使图形呈现出一定的规律性：,6_question,,6_option1,,6_option2,,6_option3,,6_option4,3,2
|
||||
7,1,符合立体图形的俯视图和左视图的是：,7_question,,7_option1,,7_option2,,7_option3,,7_option4,2,1
|
||||
8,1,最符合图形规律的是：,8_question,,8_option1,,8_option2,,8_option3,,8_option4,4,2
|
||||
9,1,选择最合适的一个填入问号处，使之呈现一定的规律性：,9_question,,9_option1,,9_option2,,9_option3,,9_option4,2,2
|
||||
10,1,将一个正方体从中间挖去一个圆柱，得到所示的新立体图形，从任意面剖开，哪一个不可能是该立体图形的截面：,10_question,,10_option1,,10_option2,,10_option3,,10_option4,2,1
|
||||
|
||||
|
@ -9,7 +9,7 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
//tower arena
|
||||
// tower arena
|
||||
func (this *Role) GetArena() {
|
||||
if this.roleArena != nil {
|
||||
this.roleArena.GetArena()
|
||||
@ -105,7 +105,7 @@ func (this *RoleArena) Load(msg interface{}) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
//通过后续协议进行数据加载login_msg
|
||||
// 通过后续协议进行数据加载login_msg
|
||||
func (this *RoleArena) LoadOther(msg interface{}) bool {
|
||||
arenaInfo := msg.(*serverproto.RoleArena)
|
||||
if arenaInfo.Arena != nil {
|
||||
@ -237,17 +237,17 @@ func (this *RoleArena) OnlineProcess() {
|
||||
}
|
||||
|
||||
/*
|
||||
reqMsg := &serverproto.SSGetRushRankReq{
|
||||
Uid: this.role.GetUUid(),
|
||||
RushType: model.Rush_Type_Arena,
|
||||
RushRound: this.arenaInfo.RushArena.RankReward,
|
||||
}
|
||||
this.role.SendRank(reqMsg)
|
||||
*/
|
||||
reqMsg := &serverproto.SSGetRushRankReq{
|
||||
Uid: this.role.GetUUid(),
|
||||
RushType: model.Rush_Type_Arena,
|
||||
RushRound: this.arenaInfo.RushArena.RankReward,
|
||||
}
|
||||
this.role.SendRank(reqMsg)
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
//段位奖励，赛季结束时调用
|
||||
// 段位奖励，赛季结束时调用
|
||||
func (this *RoleArena) ScoreLevelReward() {
|
||||
if this.arenaInfo.ArenaSeasonId < ArenaSeasonMag.lastSeasonId {
|
||||
if data, ok := model.ConvertArenaMatchList[this.scoreLevel]; ok {
|
||||
@ -491,23 +491,29 @@ func (this *RoleArena) ArenaMatch(heroList []int32) serverproto.ErrorCode {
|
||||
}
|
||||
|
||||
bMatchHeroList := true
|
||||
if len(this.arenaInfo.SelfHeroList) < len(heroList) {
|
||||
if len(this.arenaInfo.SelfHeroList) != len(heroList) {
|
||||
bMatchHeroList = false
|
||||
} else {
|
||||
for _, data := range this.arenaInfo.SelfHeroList {
|
||||
bFind := false
|
||||
for idx := range heroList {
|
||||
if data == heroList[idx] {
|
||||
bFind = true
|
||||
break
|
||||
}
|
||||
for i := 0; i < len(heroList); i++ {
|
||||
if heroList[i] != this.arenaInfo.SelfHeroList[i] {
|
||||
bMatchHeroList = false
|
||||
break
|
||||
}
|
||||
if bFind {
|
||||
continue
|
||||
}
|
||||
bMatchHeroList = false
|
||||
break
|
||||
}
|
||||
//for _, data := range this.arenaInfo.SelfHeroList {
|
||||
// bFind := false
|
||||
// for idx := range heroList {
|
||||
// if data == heroList[idx] {
|
||||
// bFind = true
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
// if bFind {
|
||||
// continue
|
||||
// }
|
||||
// bMatchHeroList = false
|
||||
// break
|
||||
//}
|
||||
}
|
||||
if !bMatchHeroList || len(this.arenaInfo.SelfHeroList) <= 0 {
|
||||
this.arenaInfo.SelfHeroList = []int32{}
|
||||
@ -748,7 +754,7 @@ func (this *RoleArena) ArenaByCount(buyCount int32) serverproto.ErrorCode {
|
||||
return serverproto.ErrorCode_ERROR_OK
|
||||
}
|
||||
|
||||
//rankType
|
||||
// rankType
|
||||
func (this *RoleArena) ArenaRankList(rankType, startIdx int32) {
|
||||
if ArenaSeasonMag.lastSeasonId <= 0 && ArenaSeasonMag.curSeasonId <= 0 {
|
||||
ackMsg := &serverproto.SCArenaRankListAck{
|
||||
@ -888,7 +894,7 @@ func (this *RoleArena) GetRushArenaInfo(ackMsg *serverproto.SCArenaActivityAck,
|
||||
}
|
||||
}
|
||||
|
||||
//增加冲榜分数
|
||||
// 增加冲榜分数
|
||||
func (this *RoleArena) AddRushArenaScore(rushRound int32, score int32) {
|
||||
if rushRound == 0 {
|
||||
return
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user