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-08-18 22:10:18 +08:00
commit 5dc63fa4d2
5 changed files with 821 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1203
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

6
bin/json/game_worldtask.json
View File

@ -5336,7 +5336,7 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 300020, "ontxe": 20240,
"id_after": 300040, "id_after": 300040,
"group": 301, "group": 301,
"exgroup": 310, "exgroup": 310,
@ -5588,7 +5588,7 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 300062, "ontxe": 20280,
"id_after": 0, "id_after": 0,
"group": 301, "group": 301,
"exgroup": 310, "exgroup": 310,
@ -5629,7 +5629,7 @@
"opencond": "", "opencond": "",
"lock": 1, "lock": 1,
"lockend": 999, "lockend": 999,
"ontxe": 300070, "ontxe": 20290,
"id_after": 0, "id_after": 0,
"group": 301, "group": 301,
"exgroup": 310, "exgroup": 310,

2
modules/gm/module.go
View File

@ -149,7 +149,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
// 发所有道具 // 发所有道具
item := this.configure.GetAllItemConfigure() item := this.configure.GetAllItemConfigure()
for _, v := range item { for _, v := range item {
if v.Bagtype != 0 { if v.Gm != 1 {
res = append(res, &cfg.Gameatn{ res = append(res, &cfg.Gameatn{
A: "item", A: "item",
T: v.Id, T: v.Id,

22
modules/stonehenge/api_story.go
View File

@ -71,7 +71,7 @@ func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq
} }
return return
} }
this.module.Debugf("%v", conf) this.module.Debugf("GetStoneStoryConf:%v", conf)
if req.Pos == 0 { if req.Pos == 0 {
event = conf.OptionEventIdGroup1 event = conf.OptionEventIdGroup1
} else if req.Pos == 1 { } else if req.Pos == 1 {
@ -109,14 +109,18 @@ func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq
szW = append(szW, int32(n)) szW = append(szW, int32(n))
} }
} }
if len(event) > 0 {
arr := strings.Split(event[comm.GetRandW(szW)], ",") arr := strings.Split(event[comm.GetRandW(szW)], ",")
if n, err := strconv.Atoi(arr[2]); err == nil { if len(arr) != 3 {
stone.Rooms.Story = int32(n) return
} }
if n, err := strconv.Atoi(arr[0]); err == nil { if n, err := strconv.Atoi(arr[2]); err == nil {
newEvent = int32(n) stone.Rooms.Story = int32(n)
stone.Rooms.Eventid[newEvent] = false }
if n, err := strconv.Atoi(arr[0]); err == nil {
newEvent = int32(n)
stone.Rooms.Eventid[newEvent] = false
}
} }
} }
} }

2
sys/configure/structs/game.itemData.go
View File

@ -36,6 +36,7 @@ type GameItemData struct {
Describe string Describe string
Dialogue string Dialogue string
Sale []*Gameatn Sale []*Gameatn
Gm int32
} }
const TypeId_GameItemData = -984700967 const TypeId_GameItemData = -984700967
@ -148,6 +149,7 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
} }
} }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gm"].(float64); !_ok_ { err = errors.New("gm error"); return }; _v.Gm = int32(_tempNum_) }
return return
} }