liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2023-11-03 15:28:29 +08:00
commit 25c2739d88
18 changed files with 753 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/json/game_achievegroup.json
View File

@ -11,7 +11,7 @@
"id": 2,
"achieve_group_id": {
"key": "achieve_achieve_all_achieve_group_id_02",
"text": "生财有道"
"text": "装备锻萃"
},
"achieve_group_icon": "cj_icon_rk_ty"
},
@ -19,7 +19,31 @@
"id": 3,
"achieve_group_id": {
"key": "achieve_achieve_all_achieve_group_id_03",
"text": "测试类型名字3"
"text": "解放双手"
},
"achieve_group_icon": "cj_icon_rk_ty"
},
{
"id": 4,
"achieve_group_id": {
"key": "achieve_achieve_all_achieve_group_id_04",
"text": "竞技的快乐"
},
"achieve_group_icon": "cj_icon_rk_ty"
},
{
"id": 5,
"achieve_group_id": {
"key": "achieve_achieve_all_achieve_group_id_05",
"text": "钻石恒久远"
},
"achieve_group_icon": "cj_icon_rk_ty"
},
{
"id": 6,
"achieve_group_id": {
"key": "achieve_achieve_all_achieve_group_id_06",
"text": "英雄汇聚"
},
"achieve_group_icon": "cj_icon_rk_ty"
}

219
bin/json/game_achievetask.json
View File

@ -73,7 +73,7 @@
"task_group_from": 2,
"task_name": {
"key": "achieve_achieve_task_task_name_22",
"text": "强化成功5次"
"text": "强化装备成功5次"
},
"task_desc": {
"key": "",
@ -96,7 +96,7 @@
"task_group_from": 2,
"task_name": {
"key": "achieve_achieve_task_task_name_23",
"text": "强化成功10次"
"text": "强化装备成功10次"
},
"task_desc": {
"key": "",
@ -119,7 +119,7 @@
"task_group_from": 2,
"task_name": {
"key": "achieve_achieve_task_task_name_24",
"text": "强化成功20次"
"text": "强化装备成功20次"
},
"task_desc": {
"key": "",
@ -158,7 +158,7 @@
"n": 10000
}
],
"jump": 103
"jump": 10020
},
{
"key": 1026,
@ -181,7 +181,7 @@
"n": 20000
}
],
"jump": 103
"jump": 10020
},
{
"key": 1027,
@ -204,6 +204,213 @@
"n": 30000
}
],
"jump": 103
"jump": 10020
},
{
"key": 1028,
"task_group_from": 4,
"task_name": {
"key": "achieve_achieve_task_task_name_28",
"text": "竞技场积分1000"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000010,
"task_icon": "cj_icon_lb_ty03",
"task_quality": 1,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"jump": 10015
},
{
"key": 1029,
"task_group_from": 4,
"task_name": {
"key": "achieve_achieve_task_task_name_29",
"text": "竞技场积分2000"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000011,
"task_icon": "cj_icon_lb_ty02",
"task_quality": 2,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
],
"jump": 10015
},
{
"key": 1030,
"task_group_from": 4,
"task_name": {
"key": "achieve_achieve_task_task_name_30",
"text": "竞技场积分3000"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000012,
"task_icon": "cj_icon_lb_ty01",
"task_quality": 3,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 30000
}
],
"jump": 10015
},
{
"key": 1031,
"task_group_from": 5,
"task_name": {
"key": "achieve_achieve_task_task_name_31",
"text": "消费1000钻石"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000013,
"task_icon": "cj_icon_lb_ty03",
"task_quality": 1,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"jump": 0
},
{
"key": 1032,
"task_group_from": 5,
"task_name": {
"key": "achieve_achieve_task_task_name_32",
"text": "消费2000钻石"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000014,
"task_icon": "cj_icon_lb_ty02",
"task_quality": 2,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
],
"jump": 0
},
{
"key": 1033,
"task_group_from": 5,
"task_name": {
"key": "achieve_achieve_task_task_name_33",
"text": "消费3000钻石"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000015,
"task_icon": "cj_icon_lb_ty01",
"task_quality": 3,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 30000
}
],
"jump": 0
},
{
"key": 1034,
"task_group_from": 6,
"task_name": {
"key": "achieve_achieve_task_task_name_34",
"text": "进行30次招募"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000016,
"task_icon": "cj_icon_lb_ty03",
"task_quality": 1,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 10000
}
],
"jump": 0
},
{
"key": 1035,
"task_group_from": 6,
"task_name": {
"key": "achieve_achieve_task_task_name_35",
"text": "进行40次招募"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000017,
"task_icon": "cj_icon_lb_ty02",
"task_quality": 2,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 20000
}
],
"jump": 0
},
{
"key": 1036,
"task_group_from": 6,
"task_name": {
"key": "achieve_achieve_task_task_name_36",
"text": "进行50次招募"
},
"task_desc": {
"key": "",
"text": ""
},
"task_buried": 16000018,
"task_icon": "cj_icon_lb_ty01",
"task_quality": 3,
"task_reward": [
{
"a": "attr",
"t": "gold",
"n": 30000
}
],
"jump": 0
}
]

96
bin/json/game_buriedcondi.json
View File

@ -31867,7 +31867,7 @@
"key": "buried_buried_condi_tasktxt_1104",
"text": "完成1次自动战斗"
},
"type": 4,
"type": 161,
"valid": 0,
"head": {
"a": "attr",
@ -31892,7 +31892,7 @@
"key": "buried_buried_condi_tasktxt_1105",
"text": "完成10次自动战斗"
},
"type": 4,
"type": 161,
"valid": 0,
"head": {
"a": "attr",
@ -31917,7 +31917,7 @@
"key": "buried_buried_condi_tasktxt_1106",
"text": "完成20次自动战斗"
},
"type": 4,
"type": 161,
"valid": 0,
"head": {
"a": "attr",
@ -31940,9 +31940,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1107",
"text": "让邦尼兔升到11级"
"text": "竞技场积分1000"
},
"type": 4,
"type": 128,
"valid": 0,
"head": {
"a": "attr",
@ -31951,10 +31951,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 11,
"filter": [
24004
],
"value": 1000,
"filter": [],
"filter2": []
},
{
@ -31967,9 +31965,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1108",
"text": "让邦尼兔升到12级"
"text": "竞技场积分2000"
},
"type": 4,
"type": 128,
"valid": 0,
"head": {
"a": "attr",
@ -31978,10 +31976,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 12,
"filter": [
24004
],
"value": 2000,
"filter": [],
"filter2": []
},
{
@ -31994,9 +31990,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1109",
"text": "让邦尼兔升到13级"
"text": "竞技场积分3000"
},
"type": 4,
"type": 128,
"valid": 0,
"head": {
"a": "attr",
@ -32005,10 +32001,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 13,
"filter": [
24004
],
"value": 3000,
"filter": [],
"filter2": []
},
{
@ -32021,9 +32015,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1110",
"text": "让邦尼兔升到14级"
"text": "消费1000钻石"
},
"type": 4,
"type": 104,
"valid": 0,
"head": {
"a": "attr",
@ -32032,10 +32026,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 14,
"filter": [
24004
],
"value": 1000,
"filter": [],
"filter2": []
},
{
@ -32048,9 +32040,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1111",
"text": "让邦尼兔升到15级"
"text": "消费2000钻石"
},
"type": 4,
"type": 104,
"valid": 0,
"head": {
"a": "attr",
@ -32059,10 +32051,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 15,
"filter": [
24004
],
"value": 2000,
"filter": [],
"filter2": []
},
{
@ -32075,9 +32065,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1112",
"text": "让邦尼兔升到16级"
"text": "消费3000钻石"
},
"type": 4,
"type": 104,
"valid": 0,
"head": {
"a": "attr",
@ -32086,10 +32076,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 16,
"filter": [
24004
],
"value": 3000,
"filter": [],
"filter2": []
},
{
@ -32102,9 +32090,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1113",
"text": "让邦尼兔升到17级"
"text": "进行30次招募"
},
"type": 4,
"type": 89,
"valid": 0,
"head": {
"a": "attr",
@ -32113,10 +32101,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 17,
"filter": [
24004
],
"value": 30,
"filter": [],
"filter2": []
},
{
@ -32129,9 +32115,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1114",
"text": "让邦尼兔升到18级"
"text": "进行40次招募"
},
"type": 4,
"type": 89,
"valid": 0,
"head": {
"a": "attr",
@ -32140,10 +32126,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 18,
"filter": [
24004
],
"value": 40,
"filter": [],
"filter2": []
},
{
@ -32156,9 +32140,9 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_1115",
"text": "让邦尼兔升到19级"
"text": "进行50次招募"
},
"type": 4,
"type": 89,
"valid": 0,
"head": {
"a": "attr",
@ -32167,10 +32151,8 @@
},
"Npc_event_type": 1,
"NPC": 103,
"value": 19,
"filter": [
24004
],
"value": 50,
"filter": [],
"filter2": []
},
{

2
bin/json/game_combatmanster.json
View File

@ -390,7 +390,7 @@
"clickstory": 0,
"BattleReadyID": 10103001,
"formatList": [
102031
101101
],
"award": [
{

24
bin/json/game_item.json
View File

@ -19981,7 +19981,7 @@
"id": "24011001",
"name": {
"key": "item_item_name_402",
"text": "第一章货币"
"text": "龙币"
},
"usetype": 1,
"color": 2,
@ -20005,11 +20005,11 @@
"img": "item_24011001",
"intr": {
"key": "item_item_intr_404",
"text": ""
"text": "剧情货币，剧情探索中获得并在章节内的商店使用。"
},
"describe": {
"key": "item_item_describe_404",
"text": ""
"text": "苦寒地带维京人的标志，原名已不可考。因其货币多篆刻龙头纹样被称为龙币。据说这些龙多由维京人驯养。"
},
"dialogue": {
"key": "item_item_dialogue_402",
@ -20028,7 +20028,7 @@
"id": "24021001",
"name": {
"key": "item_item_name_403",
"text": "第二章货币"
"text": "扇贝"
},
"usetype": 1,
"color": 2,
@ -20052,11 +20052,11 @@
"img": "item_24021001",
"intr": {
"key": "item_item_intr_405",
"text": ""
"text": "剧情货币，剧情探索中获得并在章节内的商店使用。"
},
"describe": {
"key": "item_item_describe_405",
"text": ""
"text": "扇贝虽然比不上螺贝的美丽，但因更为更常见而价值亲民，交易中使用它也就更为频繁。当然，咕噜一家只对扇贝的肉感兴趣……"
},
"dialogue": {
"key": "item_item_dialogue_403",
@ -20075,7 +20075,7 @@
"id": "24031001",
"name": {
"key": "item_item_name_404",
"text": "第三章货币"
"text": "钞票"
},
"usetype": 1,
"color": 2,
@ -20099,11 +20099,11 @@
"img": "item_24031001",
"intr": {
"key": "item_item_intr_406",
"text": ""
"text": "剧情货币，剧情探索中获得并在章节内的商店使用。"
},
"describe": {
"key": "item_item_describe_406",
"text": ""
"text": "淡黄的纸面，绿色的图案和文字。轻飘飘的外表，与它强大的购买力形成了强烈的对比。据说某个臭名昭著的坏蛋团伙，在行动之前一定会去咖啡店小坐一会，还会给几张钞票当做小费。"
},
"dialogue": {
"key": "item_item_dialogue_404",
@ -20122,7 +20122,7 @@
"id": "24041001",
"name": {
"key": "item_item_name_405",
"text": "第四章货币"
"text": "先令"
},
"usetype": 1,
"color": 2,
@ -20146,11 +20146,11 @@
"img": "item_24041001",
"intr": {
"key": "item_item_intr_407",
"text": ""
"text": "剧情货币，剧情探索中获得并在章节内的商店使用。"
},
"describe": {
"key": "item_item_describe_407",
"text": ""
"text": "在浪漫的童话世界，先令几乎就是货币的代名词。婚丧嫁娶，人们从生到死都离不开它。抓捕一个怪物或通缉犯，换取的先令更是不可估量。"
},
"dialogue": {
"key": "item_item_dialogue_405",

2
bin/json/game_loading.json
View File

@ -2,7 +2,7 @@
{
"id": 1001,
"scene": "GameMain",
"image": "ld_mh_bg01",
"image": "ld_mh_bg_zc",
"icon": "loading_icon_fc",
"prompt": {
"key": "loading_Sheet1_prompt_1",

2
bin/json/game_mainstage.json
View File

@ -17680,7 +17680,7 @@
"buried": 0,
"grouptype": [],
"Episodetype": 5,
"stage_param": 10001,
"stage_param": 30001,
"inherit": 0,
"battle_fail": 0,
"venturemodelspeed": 9,

284
bin/json/game_stonebuff.json
View File

File diff suppressed because it is too large Load Diff

6
modules/entertainment/api_boxreward.go
View File

@ -67,8 +67,10 @@ func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRe
return
}
reward := this.module.ModuleTools.GetGroupDataByLottery(conf.Group, user.Vip, user.Lv)
if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil {
return
if len(reward) > 0 {
if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil {
return
}
}
}

20
modules/entertainment/api_operatorover.go Normal file
View File

@ -0,0 +1,20 @@
package entertainment
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) OperatorOverCheck(session comm.IUserSession, req *pb.EntertainOperatorOverReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) OperatorOver(session comm.IUserSession, req *pb.EntertainOperatorOverReq) (errdata *pb.ErrorData) {
if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "operatorover", req); errdata == nil {
return
}
session.SendMsg(string(this.module.GetType()), "operatorover", &pb.EntertainOperatorOverResp{})
return
}

5
modules/entertainment/model.go
View File

@ -63,6 +63,11 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
for _, v := range this.module.configure.GetInitGameConsumeHero() {
result.Card[v] = 1
}
if dbModel == nil {
err = this.Add(uid, result)
} else {
err = dbModel.Add(uid, result)
}
}
err = nil
return result, err

32
modules/entertainment/room.go
View File

@ -41,7 +41,7 @@ type Room struct {
func (this *Room) operateTimeOut(task *timewheel.Task, args ...interface{}) {
fmt.Printf("超时+++++%d\n", time.Now().Unix())
if this.operatetimer != nil {
//this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器
this.operatetimer = nil
}
if this.player1.Userinfo.Uid == this.curPower { // 给玩家2
this.NexPower = this.player2.Userinfo.Uid
@ -154,10 +154,6 @@ func (this *Room) AiOperator() {
this.NexPower = this.player1.Userinfo.Uid
this.player1.Ps = MaxPs
this.round++
if this.operatetimer != nil { // 开启新的定时器
timewheel.Remove(this.operatetimer)
}
//this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut)
}
// 校验下次是不是消除
if !this.chessboard.CheckAndRefreshPlat() {
@ -416,12 +412,12 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}
return
}
if this.operatetimer != nil {
timewheel.Remove(this.operatetimer)
this.operatetimer = nil
}
if this.curPower != this.NexPower && len(this.szSession) > 1 {
//this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut) // 开启新的定时器
if this.curPower != this.NexPower { // 下一次操作不是自己 清除定时器
if this.operatetimer != nil {
timewheel.Remove(this.operatetimer)
this.operatetimer = nil
}
}
// 变更权限
this.curPower = this.NexPower
@ -483,6 +479,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}, this.szSession...); err != nil {
this.module.Errorln(err)
}
// 游戏开始开启一个定时器
//this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut)
}
@ -523,6 +520,18 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}, this.szSession...); err != nil {
this.module.Errorln(err)
}
case "operatorover": // 操作完成 开启一个定时器
if this.operatetimer != nil {
timewheel.Remove(this.operatetimer)
this.operatetimer = nil
}
this.operatetimer = timewheel.Add(time.Second*time.Duration(this.MaxTime), this.operateTimeOut)
if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startimer", &pb.EntertainStarTimerPush{
Time: this.MaxTime,
}, this.szSession...); err != nil {
this.module.Errorln(err)
}
}
return
@ -541,6 +550,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
)
if this.operatetimer != nil {
timewheel.Remove(this.operatetimer)
this.operatetimer = nil
}
winner = this.player1
bReward = true

22
modules/entertainment/xxlPlat.go
View File

@ -65,7 +65,7 @@ func (this *MapData) InitMap(module *Entertainment) {
this.Plat[i] = this.CreateGride(int32(i))
}
this.SetIndelibilityPlat()
//this.SetMap() // 方便测试固定地图
this.SetMap() // 方便测试固定地图
}
// 交换2个元素(参数 oid )
@ -246,14 +246,14 @@ func (this *MapData) Check4X() (bEliminate bool, xiaochu []int, s map[int]int) {
func (this *MapData) Check3X() (bEliminate bool, xiaochu []int) {
//var xiaochu []int // 即将消除的key
for k, v := range this.Plat {
// b := false
// for _, e := range this.operElem {
// if e == int32(k) {
// b = true
// break
// }
// }
if v.Cid == 0 {
b := false
for _, e := range this.operElem {
if e == int32(k) {
b = true
break
}
}
if v.Cid == 0 && !b {
continue
}
x := int32(k % Height) // x
@ -626,8 +626,8 @@ func (this *MapData) SetMap() {
3, 4, 3, 5, 6, 1, 6,
1, 4, 6, 4, 2, 3, 6,
1, 5, 6, 5, 6, 1, 4,
5, 3, 4, 1, 4, 3, 3,
3, 3, 5, 1, 1, 2, 5,
6, 6, 4, 6, 4, 3, 3,
3, 3, 6, 1, 1, 2, 5,
// 1, 4, 2, 5, 4, 5, 2,
// 3, 2, 3, 5, 2, 1, 4,
// 2, 5, 5, 4, 5, 4, 1,

26
modules/stonehenge/api_event.go
View File

@ -450,6 +450,32 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
}
}
update["userbuff"] = stone.Userbuff
case EventType22: //
lenSelect := len(stone.Rooms.Selectbuff)
if pos, err := strconv.Atoi(req.Param1); err == nil {
if lenSelect == 0 || lenSelect <= pos {
return
}
delbuff := stone.Rooms.Selectbuff[pos]
if _, ok := stone.Userbuff[delbuff]; ok {
delete(stone.Userbuff, delbuff)
update["userbuff"] = stone.Userbuff
} else {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
}
} else { // 参数错误
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
}
}
stone.Rooms.Eventid[req.Eventid] = true //
// 校验事件有后续事件

4
modules/stonehenge/api_shop.go
View File

@ -45,6 +45,9 @@ func (this *apiComp) Store(session comm.IUserSession, req *pb.StonehengeStoreReq
}
return
}
newEvent := storeConf.EventId
this.module.modelStonehenge.AddNewEvent([]int32{newEvent}, stone)
if stone.Rooms.Shop == nil {
stone.Rooms.Shop = make(map[int32]int32)
}
@ -72,6 +75,7 @@ func (this *apiComp) Store(session comm.IUserSession, req *pb.StonehengeStoreReq
session.SendMsg(string(this.module.GetType()), "store", &pb.StonehengeStoreResp{
StoreId: req.StoreId,
Shop: stone.Rooms.Shop,
Room: stone.Rooms,
})
return
}

1
modules/stonehenge/core.go
View File

@ -11,6 +11,7 @@ const (
EventType18 = 18 // 回血事件 非场景
EventType19 = 19 // 扣血事件 非场景
EventType20 = 20 // 克隆一名英雄
EventType22 = 22 // 删除buff（商店用）
EventType23 = 23 // 事件buff强化
EventType24 = 24 // 增加背包中指定道具数量
EventType25 = 25 // buff三选一

9
modules/stonehenge/modelStonehenge.go
View File

@ -143,6 +143,15 @@ func (this *MStonehenge) AddNewEvent(event []int32, stone *pb.DBStonehenge) {
if _, ok := stone.Rooms.Passive[newEventConf.EventId]; !ok {
stone.Rooms.Box[newEventConf.EventId] = newEventConf.Value1
}
case EventType22: //随机三个buff
stone.Rooms.Selectbuff = make([]int32, 0)
for k := range stone.Userbuff {
stone.Rooms.Selectbuff = append(stone.Rooms.Selectbuff, k)
if len(stone.Rooms.Selectbuff) >= 3 {
break
}
}
}
}
}

253
pb/entertain_msg.pb.go
View File

@ -1990,6 +1990,140 @@ func (x *EntertainBoxRewardResp) GetReward() []*UserAtno {
return nil
}
// 玩家操作完成
type EntertainOperatorOverReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间号
}
func (x *EntertainOperatorOverReq) Reset() {
*x = EntertainOperatorOverReq{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[35]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainOperatorOverReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainOperatorOverReq) ProtoMessage() {}
func (x *EntertainOperatorOverReq) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[35]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EntertainOperatorOverReq.ProtoReflect.Descriptor instead.
func (*EntertainOperatorOverReq) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{35}
}
func (x *EntertainOperatorOverReq) GetRoomid() string {
if x != nil {
return x.Roomid
}
return ""
}
type EntertainOperatorOverResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *EntertainOperatorOverResp) Reset() {
*x = EntertainOperatorOverResp{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[36]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainOperatorOverResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainOperatorOverResp) ProtoMessage() {}
func (x *EntertainOperatorOverResp) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[36]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EntertainOperatorOverResp.ProtoReflect.Descriptor instead.
func (*EntertainOperatorOverResp) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{36}
}
// 开启一个定时器
type EntertainStarTimerPush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Time int32 `protobuf:"varint,1,opt,name=time,proto3" json:"time"`
}
func (x *EntertainStarTimerPush) Reset() {
*x = EntertainStarTimerPush{}
if protoimpl.UnsafeEnabled {
mi := &file_entertain_entertain_msg_proto_msgTypes[37]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EntertainStarTimerPush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EntertainStarTimerPush) ProtoMessage() {}
func (x *EntertainStarTimerPush) ProtoReflect() protoreflect.Message {
mi := &file_entertain_entertain_msg_proto_msgTypes[37]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EntertainStarTimerPush.ProtoReflect.Descriptor instead.
func (*EntertainStarTimerPush) Descriptor() ([]byte, []int) {
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{37}
}
func (x *EntertainStarTimerPush) GetTime() int32 {
if x != nil {
return x.Time
}
return 0
}
var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
var file_entertain_entertain_msg_proto_rawDesc = []byte{
@ -2184,8 +2318,16 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f,
0x78, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
0x77, 0x61, 0x72, 0x64, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71,
0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e, 0x74, 0x65,
0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4f, 0x76, 0x65,
0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
0x69, 0x6e, 0x53, 0x74, 0x61, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12,
0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74,
0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -2200,7 +2342,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
return file_entertain_entertain_msg_proto_rawDescData
}
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39)
var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainMatchReq)(nil), // 0: EntertainMatchReq
(*EntertainMatchResp)(nil), // 1: EntertainMatchResp
@ -2237,40 +2379,43 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
(*EntertainGameReadyPush)(nil), // 32: EntertainGameReadyPush
(*EntertainBoxRewardReq)(nil), // 33: EntertainBoxRewardReq
(*EntertainBoxRewardResp)(nil), // 34: EntertainBoxRewardResp
nil, // 35: EntertainChangePush.CardEntry
(*PlayerData)(nil), // 36: PlayerData
(*MapData)(nil), // 37: MapData
(*UserAtno)(nil), // 38: UserAtno
(*BoxData)(nil), // 39: BoxData
(*DBXXLData)(nil), // 40: DBXXLData
(*EntertainOperatorOverReq)(nil), // 35: EntertainOperatorOverReq
(*EntertainOperatorOverResp)(nil), // 36: EntertainOperatorOverResp
(*EntertainStarTimerPush)(nil), // 37: EntertainStarTimerPush
nil, // 38: EntertainChangePush.CardEntry
(*PlayerData)(nil), // 39: PlayerData
(*MapData)(nil), // 40: MapData
(*UserAtno)(nil), // 41: UserAtno
(*BoxData)(nil), // 42: BoxData
(*DBXXLData)(nil), // 43: DBXXLData
}
var file_entertain_entertain_msg_proto_depIdxs = []int32{
36, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
36, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
37, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
37, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
36, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
36, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
36, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
36, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
37, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
38, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
39, // 10: EntertainGameOverPush.box:type_name -> BoxData
36, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
36, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
37, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
36, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
36, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
37, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
37, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
40, // 18: EntertainGetListResp.data:type_name -> DBXXLData
40, // 19: EntertainRewardResp.data:type_name -> DBXXLData
38, // 20: EntertainRewardResp.reward:type_name -> UserAtno
35, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
36, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
36, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
39, // 24: EntertainBoxRewardResp.box:type_name -> BoxData
38, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno
39, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
39, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
40, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
40, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
39, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
39, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
39, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
39, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
40, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
41, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
42, // 10: EntertainGameOverPush.box:type_name -> BoxData
39, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
39, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
40, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
39, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
39, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
40, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
40, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
43, // 18: EntertainGetListResp.data:type_name -> DBXXLData
43, // 19: EntertainRewardResp.data:type_name -> DBXXLData
41, // 20: EntertainRewardResp.reward:type_name -> UserAtno
38, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
39, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
39, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
42, // 24: EntertainBoxRewardResp.box:type_name -> BoxData
41, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno
26, // [26:26] is the sub-list for method output_type
26, // [26:26] is the sub-list for method input_type
26, // [26:26] is the sub-list for extension type_name
@ -2706,6 +2851,42 @@ func file_entertain_entertain_msg_proto_init() {
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainOperatorOverReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainOperatorOverResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_entertain_entertain_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EntertainStarTimerPush); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -2713,7 +2894,7 @@ func file_entertain_entertain_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 36,
NumMessages: 39,
NumExtensions: 0,
NumServices: 0,
},