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

三消技能类型调整

Browse Source
This commit is contained in:
meixiongfeng 2024-01-03 18:59:04 +08:00
parent 829b402ada
commit 31dcfe1f2d
23 changed files with 684 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bin/json/game_asklibrary.json
View File

@ -2,7 +2,7 @@
{
"id": 1,
"ExaminationGroup": 1001,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_01",
"text": "菲奥娜父亲的真实身份是？"
@ -33,7 +33,7 @@
{
"id": 2,
"ExaminationGroup": 1001,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_02",
"text": "诺斯是我们“守护联盟”的创始人之一，也是一位尊贵的守护神。那请问他成神之前是干什么的呢？"
@ -64,7 +64,7 @@
{
"id": 3,
"ExaminationGroup": 1001,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_03",
"text": "匹诺曹的良心是什么？"
@ -95,7 +95,7 @@
{
"id": 4,
"ExaminationGroup": 1002,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_04",
"text": "阿宝的亲生父亲是谁？"
@ -126,7 +126,7 @@
{
"id": 5,
"ExaminationGroup": 1002,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_05",
"text": "希卡普的黑龙，和那条白龙，生的龙是什么品种？"
@ -157,7 +157,7 @@
{
"id": 6,
"ExaminationGroup": 1002,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_06",
"text": "马达加斯加企鹅团最喜欢吃什么？"
@ -188,7 +188,7 @@
{
"id": 7,
"ExaminationGroup": 1003,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_07",
"text": "博肯族女仆布里奇特告别王子逃走时，留在台阶上的鞋子是什么？"
@ -219,7 +219,7 @@
{
"id": 8,
"ExaminationGroup": 1003,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_08",
"text": "史莱克向菲欧娜求婚时送她的戒指里刻着什么字？"
@ -250,7 +250,7 @@
{
"id": 9,
"ExaminationGroup": 1003,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_09",
"text": "穿靴猫有一次冒险死于炮弹爆炸，那次冒险中他本来想偷什么？"
@ -281,7 +281,7 @@
{
"id": 10,
"ExaminationGroup": 1004,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_10",
"text": "巴布女王的老爹，做的手势叫什么名字？"
@ -312,7 +312,7 @@
{
"id": 11,
"ExaminationGroup": 1004,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_11",
"text": "瓜哥发明的腰带是用什么做的？"
@ -343,7 +343,7 @@
{
"id": 12,
"ExaminationGroup": 1004,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_12",
"text": "悍娇虎最喜欢什么口味的食物？"
@ -374,7 +374,7 @@
{
"id": 13,
"ExaminationGroup": 1005,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_13",
"text": "亲衣节时，戈伯的汤加进了什么意外的调料？"
@ -405,7 +405,7 @@
{
"id": 14,
"ExaminationGroup": 1005,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_14",
"text": "雷霆狂花出阵时，众人涂在脸上的颜料是什么来源？"
@ -436,7 +436,7 @@
{
"id": 15,
"ExaminationGroup": 1005,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_15",
"text": "骇客蛛的黑客知识在哪个网站上学的？"
@ -467,7 +467,7 @@
{
"id": 16,
"ExaminationGroup": 1006,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_16",
"text": "希卡普的老妈瓦尔卡做的丸子，被戈伯评价像什么一样？"
@ -498,7 +498,7 @@
{
"id": 17,
"ExaminationGroup": 1006,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_17",
"text": "什么植物能让龙轻轻一闻，就欲仙欲死，欲罢不能？"
@ -529,7 +529,7 @@
{
"id": 18,
"ExaminationGroup": 1006,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_18",
"text": "以下哪个不是冰霜杰克的特征？"
@ -560,7 +560,7 @@
{
"id": 19,
"ExaminationGroup": 1007,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_19",
"text": "哪种龙的蛋孵化时会发生强烈的爆炸？"
@ -591,7 +591,7 @@
{
"id": 20,
"ExaminationGroup": 1007,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_20",
"text": "阿宝的乳名是什么？"
@ -622,7 +622,7 @@
{
"id": 21,
"ExaminationGroup": 1007,
"type": 0,
"type": 1,
"topic": {
"key": "ask_ask_library_topic_21",
"text": "马达加斯加企鹅团的军师叫什么？"

792
bin/json/game_battleready.json
View File

File diff suppressed because it is too large Load Diff

12
bin/json/game_breakingbadtag.json
View File

@ -2,42 +2,42 @@
{
"Type": 1,
"TagName": {
"key": "breakingbad_gourmet_TagName_1",
"key": "breakingbad_gourmettag_TagName_1",
"text": "点心"
}
},
{
"Type": 2,
"TagName": {
"key": "breakingbad_gourmet_TagName_2",
"key": "breakingbad_gourmettag_TagName_2",
"text": "凉菜"
}
},
{
"Type": 3,
"TagName": {
"key": "breakingbad_gourmet_TagName_3",
"key": "breakingbad_gourmettag_TagName_3",
"text": "热菜"
}
},
{
"Type": 4,
"TagName": {
"key": "breakingbad_gourmet_TagName_4",
"key": "breakingbad_gourmettag_TagName_4",
"text": "汤"
}
},
{
"Type": 5,
"TagName": {
"key": "breakingbad_gourmet_TagName_5",
"key": "breakingbad_gourmettag_TagName_5",
"text": "饮料"
}
},
{
"Type": 6,
"TagName": {
"key": "breakingbad_gourmet_TagName_6",
"key": "breakingbad_gourmettag_TagName_6",
"text": "主食"
}
}

10
bin/json/game_bubblegroup.json
View File

@ -1442,7 +1442,7 @@
{
"KeyId": 121,
"GroupID": 20030234,
"Type": 0,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
@ -1454,7 +1454,7 @@
{
"KeyId": 122,
"GroupID": 20030235,
"Type": 0,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
@ -1478,7 +1478,7 @@
{
"KeyId": 124,
"GroupID": 15000001,
"Type": 0,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
@ -1490,7 +1490,7 @@
{
"KeyId": 125,
"GroupID": 15000002,
"Type": 0,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
@ -1502,7 +1502,7 @@
{
"KeyId": 126,
"GroupID": 15000003,
"Type": 0,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,

8
bin/json/game_caravanevent.json
View File

@ -4,7 +4,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 2,
"mustdo": false,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
@ -34,7 +34,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 2,
"mustdo": false,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
@ -64,7 +64,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 2,
"mustdo": false,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,
@ -94,7 +94,7 @@
"eventgroup": 1,
"eventweight": 250,
"eventtype": 1,
"mustdo": 2,
"mustdo": false,
"citystory": 50020010,
"citynormal": 50020030,
"cityabnormal": 50020020,

6
bin/json/game_global.json
View File

@ -678,9 +678,9 @@
},
"passlvmax": 50,
"guildboss_roulette": {
"a": "attr",
"t": "arenacoin",
"n": 1000
"a": "item",
"t": "22100001",
"n": 1
},
"guildboss_kill_Preview": [
{

133
bin/json/game_mainstage.json
View File

@ -23848,9 +23848,11 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [
"senlinmiwu",
"senlinmiwu01",
"miwu"
],
"scene_effectfilter": "",
@ -23932,9 +23934,11 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [
"senlinmiwu",
"senlinmiwu01",
"miwu"
],
"scene_effectfilter": "",
@ -24064,9 +24068,11 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [
"senlinmiwu",
"senlinmiwu01",
"miwu"
],
"scene_effectfilter": "",
@ -24148,9 +24154,11 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [
"senlinmiwu",
"senlinmiwu01",
"miwu"
],
"scene_effectfilter": "",
@ -24282,6 +24290,7 @@
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [
"senlinmiwu02",
"miwu"
],
"scene_effectfilter": "",
@ -24413,6 +24422,7 @@
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [
"senlinmiwu03",
"miwu"
],
"scene_effectfilter": "",
@ -24542,7 +24552,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -24673,7 +24686,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -24756,7 +24772,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -24839,7 +24858,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -24922,7 +24944,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -25005,7 +25030,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -25136,7 +25164,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -25219,7 +25250,9 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -25302,7 +25335,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/13004/13004_q.prefab"
],
"scene_effect": [
"miwu"
],
@ -25385,10 +25421,11 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [
"miwuxiaosan"
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/13004/13004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
@ -25468,7 +25505,9 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -25597,7 +25636,9 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -25678,7 +25719,9 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -25807,7 +25850,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -25936,7 +25982,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26323,7 +26372,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26452,7 +26504,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26662,7 +26717,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26743,7 +26801,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26872,7 +26933,9 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -26953,7 +27016,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
@ -27082,7 +27148,10 @@
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"ventureavatar": [
"Person/24004/24004_q.prefab",
"Person/45004/45004_q.prefab"
],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,

6
bin/json/game_playerskill.json
View File

@ -1,6 +1,6 @@
[
{
"key": 10001,
"key": "10001",
"skillvalue": 0,
"icon": "sx_img_cz",
"name": {
@ -17,7 +17,7 @@
"jump": 103
},
{
"key": 10002,
"key": "10002",
"skillvalue": 0,
"icon": "sx_img_fj",
"name": {
@ -34,7 +34,7 @@
"jump": 103
},
{
"key": 10003,
"key": "10003",
"skillvalue": 0,
"icon": "sx_img_pz",
"name": {

2
modules/caravan/api_gotocity.go
View File

@ -56,7 +56,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
if list.Tasktime-configure.Now().Unix() > int64(event.Eventtime) { //TODO 任务超时
this.module.CheckCaravanTask(session, list)
}
if event.Mustdo == 1 { // 需要完成强制任务
if event.Mustdo { // 需要完成强制任务
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TrollTask,
Title: pb.ErrorCode_TrollTask.ToString(),

2
modules/entertainment/api_match.go
View File

@ -78,7 +78,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
}
}
mySkill := make(map[int32]int32, 0)
mySkill := make(map[string]int32, 0)
for _, v := range req.Skillcard {
mySkill[v] = 1
}

21
modules/entertainment/configure.go
View File

@ -278,7 +278,7 @@ func (this *configureComp) GetGameNormalElem() (rd int32) {
rd = comm.GetRandW(szWeight) + 1
return
}
func (this *configureComp) GetGamePlaySkill(skillid int32) (conf *cfg.GamePlayerSkillData, err error) {
func (this *configureComp) GetGamePlaySkill(skillid string) (conf *cfg.GamePlayerSkillData, err error) {
var (
v interface{}
)
@ -341,7 +341,7 @@ func (this *configureComp) getPassCheckCfg() (data *cfg.GamePassCheck, err error
return
}
func (this *configureComp) GetInitGameConsumeSkill() (skill []int32) {
func (this *configureComp) GetInitGameConsumeSkill() (skill []string) {
if v, err := this.GetConfigure(game_playerskill); err == nil {
if configure, ok := v.(*cfg.GamePlayerSkill); ok {
@ -365,3 +365,20 @@ func (this *configureComp) GetConsumeTaskData() (conf []*cfg.GameConsumeTaskData
return
}
func (this *configureComp) GetGamePlaySkillByTouch(skilltouch int32) (conf *cfg.GamePlayerSkillData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(game_playerskill); err == nil {
if configure, ok := v.(*cfg.GamePlayerSkill); ok {
for _, v := range configure.GetDataList() {
if v.Skilltouch == skilltouch {
conf = v
return
}
}
}
}
err = comm.NewNotFoundConfErr(moduleName, game_playerskill, skilltouch)
return
}

1
modules/entertainment/match.go
View File

@ -68,7 +68,6 @@ func (this *matchComp) MatchNotic(players map[string]interface{}) (err error) {
playerSlice = append(playerSlice, v.(*pb.DBXXLMatch))
}
for pos, v := range playerSlice {
if pos == 0 {
p1 = &pb.PlayerData{
Userinfo: v.Userinfo,

2
modules/entertainment/model.go
View File

@ -44,7 +44,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
result = &pb.DBXXLData{
Reward: map[int32]int32{},
Card: map[string]int32{},
Skill: map[int32]int32{},
Skill: map[string]int32{},
}
err = this.Get(uid, result)

28
modules/entertainment/module.go
View File

@ -11,7 +11,6 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/db"
"strconv"
)
func NewModule() core.IModule {
@ -185,8 +184,8 @@ func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr str
RoomType: 0,
Card1: "",
Card2: "",
Skill1: make(map[int32]int32),
Skill2: make(map[int32]int32),
Skill1: make(map[string]int32),
Skill2: make(map[string]int32),
}
red *pb.DBUser
blue *pb.DBUser
@ -266,30 +265,11 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[
result *pb.DBXXLData
err error
)
// for k := range skill {
// if _, err := this.model.module.configure.GetGameConsumeHero(k); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// Message: err.Error(),
// }
// return
// }
// }
if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil {
return
}
for k, v := range skill {
if iKey, err := strconv.Atoi(k); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
} else {
result.Skill[int32(iKey)] += v
}
result.Skill[k] += v
}
this.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
"skill": result.Skill,
@ -304,7 +284,7 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[
}
// 消耗一张技能卡
func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard int32) (errdata *pb.ErrorData) {
func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard string) (errdata *pb.ErrorData) {
var (
result *pb.DBXXLData

25
modules/entertainment/room.go
View File

@ -155,17 +155,20 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
}
return
} else if req.Itype > 0 { //玩家卡牌技能
if curPlayer.Skill[req.Itype] <= 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足
Title: pb.ErrorCode_EntertainNoSkillCard.ToString(),
if conf, err := this.module.configure.GetGamePlaySkillByTouch(req.Itype); err != nil {
if curPlayer.Skill[conf.Key] <= 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足
Title: pb.ErrorCode_EntertainNoSkillCard.ToString(),
}
return
}
curPlayer.Skill[conf.Key] -= 1
if errdata = this.UserCardSkill(curPlayer, color, conf.Key, req.Curid); errdata != nil {
return
}
return
}
curPlayer.Skill[req.Itype] -= 1
if errdata = this.UserCardSkill(curPlayer, color, req.Itype, req.Curid); errdata != nil {
return
}
return
}
if req.Itype == 0 && req.Curid == 0 && req.Targetid == 0 {
@ -934,7 +937,7 @@ func (this *Room) ChangePower() {
}
// 玩家释放技能
func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid int32, curid int32) (errdata *pb.ErrorData) {
func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid string, curid int32) (errdata *pb.ErrorData) {
var (
curScore int32 // 该次操作的得分
oid1 int32 // 唯一id
@ -1006,7 +1009,7 @@ func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid i
Round: this.round,
User1: this.player1,
User2: this.player2,
Itype: skillid,
Itype: conf.Skilltouch,
Curid: oid1,
Targetid: oid2,
}, this.szSession...); err != nil {

66
pb/entertain_db.pb.go
View File

@ -177,13 +177,13 @@ type PlayerData struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分
Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力
Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡
Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度
Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[int32]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分
Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力
Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡
Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度
Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[string]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量
}
func (x *PlayerData) Reset() {
@ -260,7 +260,7 @@ func (x *PlayerData) GetConsumeexp() int32 {
return 0
}
func (x *PlayerData) GetSkill() map[int32]int32 {
func (x *PlayerData) GetSkill() map[string]int32 {
if x != nil {
return x.Skill
}
@ -273,10 +273,10 @@ type DBXXLMatch struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[int32]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
Skill map[string]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
}
func (x *DBXXLMatch) Reset() {
@ -332,7 +332,7 @@ func (x *DBXXLMatch) GetConsumeexp() int32 {
return 0
}
func (x *DBXXLMatch) GetSkill() map[int32]int32 {
func (x *DBXXLMatch) GetSkill() map[string]int32 {
if x != nil {
return x.Skill
}
@ -406,13 +406,13 @@ type DBXXLData struct {
Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 (客户端不用)
Playtype []int32 `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"` // 每天随机玩法
Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"`
Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用
ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间
Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数
Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0)
Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜
Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度
Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用
ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间
Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数
Skill map[string]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0)
Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜
Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度
Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"`
Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买
Maxconsumeexp int32 `protobuf:"varint,17,opt,name=maxconsumeexp,proto3" json:"maxconsumeexp"` // 最大赛季积分
@ -531,7 +531,7 @@ func (x *DBXXLData) GetTouxiang() int32 {
return 0
}
func (x *DBXXLData) GetSkill() map[int32]int32 {
func (x *DBXXLData) GetSkill() map[string]int32 {
if x != nil {
return x.Skill
}
@ -607,11 +607,11 @@ type DBXxlRules struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型
Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡
Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡
Skill1 map[int32]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能
Skill2 map[int32]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能
RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型
Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡
Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡
Skill1 map[string]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能
Skill2 map[string]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能
}
func (x *DBXxlRules) Reset() {
@ -667,14 +667,14 @@ func (x *DBXxlRules) GetCard2() string {
return ""
}
func (x *DBXxlRules) GetSkill1() map[int32]int32 {
func (x *DBXxlRules) GetSkill1() map[string]int32 {
if x != nil {
return x.Skill1
}
return nil
}
func (x *DBXxlRules) GetSkill2() map[int32]int32 {
func (x *DBXxlRules) GetSkill2() map[string]int32 {
if x != nil {
return x.Skill2
}
@ -957,7 +957,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0xd7, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29,
@ -971,7 +971,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b,
0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a,
0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78,
0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20,
@ -1027,7 +1027,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b,
0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x3a, 0x02, 0x38, 0x01, 0x22, 0xac, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75,
0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18,
@ -1042,11 +1042,11 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a,
0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c,
0x6c, 0x32, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0xa6, 0x01, 0x0a, 0x09, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65,
0x72, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,

16
pb/entertain_msg.pb.go
View File

@ -26,8 +26,8 @@ type EntertainMatchReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡
Skillcard []int32 `protobuf:"varint,2,rep,packed,name=skillcard,proto3" json:"skillcard"`
Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡
Skillcard []string `protobuf:"bytes,2,rep,name=skillcard,proto3" json:"skillcard"`
}
func (x *EntertainMatchReq) Reset() {
@ -69,7 +69,7 @@ func (x *EntertainMatchReq) GetIdcard() string {
return ""
}
func (x *EntertainMatchReq) GetSkillcard() []int32 {
func (x *EntertainMatchReq) GetSkillcard() []string {
if x != nil {
return x.Skillcard
}
@ -1313,8 +1313,8 @@ type EntertainChangePush struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
Skill map[int32]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
Skill map[string]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
}
func (x *EntertainChangePush) Reset() {
@ -1356,7 +1356,7 @@ func (x *EntertainChangePush) GetCard() map[string]int32 {
return nil
}
func (x *EntertainChangePush) GetSkill() map[int32]int32 {
func (x *EntertainChangePush) GetSkill() map[string]int32 {
if x != nil {
return x.Skill
}
@ -2641,7 +2641,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16,
0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x63,
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x63, 0x61, 0x72, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61,
0x79, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68,
@ -2782,7 +2782,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72,
0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69,

34
sys/configure/structs/Game.BattlePlayType.go Normal file
View File

@ -0,0 +1,34 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
GameBattlePlayType_Null = 0
GameBattlePlayType_Mainline = 1
GameBattlePlayType_Pagoda = 2
GameBattlePlayType_Rtask = 3
GameBattlePlayType_Hunting = 4
GameBattlePlayType_Viking = 5
GameBattlePlayType_Moonfantasy = 6
GameBattlePlayType_Arena = 7
GameBattlePlayType_Academy = 8
GameBattlePlayType_Heroteaching = 9
GameBattlePlayType_Combat = 10
GameBattlePlayType_Enchant = 11
GameBattlePlayType_Sociaty = 12
GameBattlePlayType_Friendsmeet = 13
GameBattlePlayType_Practicenpc = 14
GameBattlePlayType_Race = 15
GameBattlePlayType_Cycle = 16
GameBattlePlayType_Guildgve = 17
GameBattlePlayType_Stone = 18
GameBattlePlayType_Expboos = 19
GameBattlePlayType_IsLand = 20
GameBattlePlayType_Integral = 21
)

16
sys/configure/structs/Game.BattleReadyData.go
View File

@ -18,13 +18,13 @@ type GameBattleReadyData struct {
BattleScenes []string
BGMusic string
LoadingId int32
HideAlienSpace int32
HideFightUI int32
HideAlienSpace bool
HideFightUI bool
RuleTips string
BattleTips string
BattleEvents []int32
ScoreGroupID int32
DisableAiCamera int32
DisableAiCamera bool
ChoseCamp []int32
DisableCamp []int32
DefaultHero int32
@ -34,7 +34,7 @@ type GameBattleReadyData struct {
HeroCheck []string
RedAssistTeam int32
BlueAssistTeam int32
CanFriendHelp int32
CanFriendHelp bool
Numrounds int32
}
@ -65,8 +65,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; if _v.BGMusic, _ok_ = _buf["BGMusic"].(string); !_ok_ { err = errors.New("BGMusic error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoadingId"].(float64); !_ok_ { err = errors.New("LoadingId error"); return }; _v.LoadingId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideFightUI"].(float64); !_ok_ { err = errors.New("HideFightUI error"); return }; _v.HideFightUI = int32(_tempNum_) }
{ var _ok_ bool; if _v.HideAlienSpace, _ok_ = _buf["HideAlienSpace"].(bool); !_ok_ { err = errors.New("HideAlienSpace error"); return } }
{ var _ok_ bool; if _v.HideFightUI, _ok_ = _buf["HideFightUI"].(bool); !_ok_ { err = errors.New("HideFightUI error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BattleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BattleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BattleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
@ -84,7 +84,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ScoreGroupID"].(float64); !_ok_ { err = errors.New("ScoreGroupID error"); return }; _v.ScoreGroupID = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
{ var _ok_ bool; if _v.DisableAiCamera, _ok_ = _buf["disableAiCamera"].(bool); !_ok_ { err = errors.New("disableAiCamera error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
@ -172,7 +172,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) }
{ var _ok_ bool; if _v.CanFriendHelp, _ok_ = _buf["CanFriendHelp"].(bool); !_ok_ { err = errors.New("CanFriendHelp error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
return
}

14
sys/configure/structs/Game.BattleScoreType.go Normal file
View File

@ -0,0 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
const (
GameBattleScoreType_Ordinary = 0
GameBattleScoreType_Coefficient = 1
)

4
sys/configure/structs/Game.CaravanEventData.go
View File

@ -15,7 +15,7 @@ type GameCaravanEventData struct {
Eventgroup int32
Eventweight int32
Eventtype int32
Mustdo int32
Mustdo bool
Citystory int32
Citynormal int32
Cityabnormal int32
@ -41,7 +41,7 @@ func (_v *GameCaravanEventData)Deserialize(_buf map[string]interface{}) (err err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventgroup"].(float64); !_ok_ { err = errors.New("eventgroup error"); return }; _v.Eventgroup = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventweight"].(float64); !_ok_ { err = errors.New("eventweight error"); return }; _v.Eventweight = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) }
{ var _ok_ bool; if _v.Mustdo, _ok_ = _buf["mustdo"].(bool); !_ok_ { err = errors.New("mustdo error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citynormal"].(float64); !_ok_ { err = errors.New("citynormal error"); return }; _v.Citynormal = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityabnormal"].(float64); !_ok_ { err = errors.New("cityabnormal error"); return }; _v.Cityabnormal = int32(_tempNum_) }

8
sys/configure/structs/Game.PlayerSkill.go
View File

@ -9,13 +9,13 @@
package cfg
type GamePlayerSkill struct {
_dataMap map[int32]*GamePlayerSkillData
_dataMap map[string]*GamePlayerSkillData
_dataList []*GamePlayerSkillData
}
func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error) {
_dataList := make([]*GamePlayerSkillData, 0, len(_buf))
dataMap := make(map[int32]*GamePlayerSkillData)
dataMap := make(map[string]*GamePlayerSkillData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePlayerSkillData(_ele_); err2 != nil {
return nil, err2
@ -27,7 +27,7 @@ func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error)
return &GamePlayerSkill{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePlayerSkill) GetDataMap() map[int32]*GamePlayerSkillData {
func (table *GamePlayerSkill) GetDataMap() map[string]*GamePlayerSkillData {
return table._dataMap
}
@ -35,7 +35,7 @@ func (table *GamePlayerSkill) GetDataList() []*GamePlayerSkillData {
return table._dataList
}
func (table *GamePlayerSkill) Get(key int32) *GamePlayerSkillData {
func (table *GamePlayerSkill) Get(key string) *GamePlayerSkillData {
return table._dataMap[key]
}

4
sys/configure/structs/Game.PlayerSkillData.go
View File

@ -11,7 +11,7 @@ package cfg
import "errors"
type GamePlayerSkillData struct {
Key int32
Key string
Skillvalue int32
Icon string
Name string
@ -29,7 +29,7 @@ func (*GamePlayerSkillData) GetTypeId() int32 {
}
func (_v *GamePlayerSkillData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillvalue"].(float64); !_ok_ { err = errors.New("skillvalue error"); return }; _v.Skillvalue = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }