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:
wh_zcy 2023-03-29 19:06:34 +08:00
commit cf33b5b139
13 changed files with 129 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/json/game_breakingbad.json
View File

@ -2,7 +2,7 @@
{
"delicacies": "132000",
"recipe": [],
"Type": 1,
"Type": -1,
"flame": 1,
"unlockreward": {
"a": "attr",
@ -22,7 +22,7 @@
"n": 10
}
],
"Type": 2,
"Type": 1,
"flame": 10,
"unlockreward": {
"a": "attr",
@ -42,7 +42,7 @@
"n": 5
}
],
"Type": 3,
"Type": 2,
"flame": 10,
"unlockreward": {
"a": "attr",
@ -62,7 +62,7 @@
"n": 5
}
],
"Type": 3,
"Type": 2,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -78,7 +78,7 @@
"n": 20
}
],
"Type": 3,
"Type": 2,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -94,7 +94,7 @@
"n": 20
}
],
"Type": 2,
"Type": 1,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -114,7 +114,7 @@
"n": 10
}
],
"Type": 3,
"Type": 2,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -130,7 +130,7 @@
"n": 20
}
],
"Type": 2,
"Type": 1,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -150,7 +150,7 @@
"n": 10
}
],
"Type": 2,
"Type": 1,
"flame": 5,
"unlockreward": {
"a": "attr",
@ -166,7 +166,7 @@
"n": 20
}
],
"Type": 2,
"Type": 1,
"flame": 5,
"unlockreward": {
"a": "attr",

24
bin/json/game_bubblegroup.json
View File

@ -250,5 +250,29 @@
"key": "bubblegroup_21",
"text": "别冲动，先屏住呼吸~"
}
},
{
"KeyId": 22,
"GroupID": 15001,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_22",
"text": "你们这里的馆主呢？去把他给我叫来！"
}
},
{
"KeyId": 23,
"GroupID": 15002,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
"weight": 10,
"Text_Bubble": {
"key": "bubblegroup_23",
"text": "还以为一届好汉，原来只是鼠辈而已"
}
}
]

30
bin/json/game_item.json
View File

@ -10267,7 +10267,7 @@
},
"usetype": 13,
"color": 1,
"bagtype": 1,
"bagtype": 4,
"index": 99,
"special_type": 0,
"time": 0,
@ -10311,7 +10311,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 99,
"special_type": 0,
"time": 0,
@ -10355,7 +10355,7 @@
},
"usetype": 13,
"color": 4,
"bagtype": 1,
"bagtype": 4,
"index": 1,
"special_type": 0,
"time": 0,
@ -10399,7 +10399,7 @@
},
"usetype": 13,
"color": 4,
"bagtype": 1,
"bagtype": 4,
"index": 2,
"special_type": 0,
"time": 0,
@ -10443,7 +10443,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 3,
"special_type": 0,
"time": 0,
@ -10487,7 +10487,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 4,
"special_type": 0,
"time": 0,
@ -10531,7 +10531,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 5,
"special_type": 0,
"time": 0,
@ -10575,7 +10575,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 6,
"special_type": 0,
"time": 0,
@ -10619,7 +10619,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 7,
"special_type": 0,
"time": 0,
@ -10663,7 +10663,7 @@
},
"usetype": 13,
"color": 3,
"bagtype": 1,
"bagtype": 4,
"index": 8,
"special_type": 0,
"time": 0,
@ -10707,7 +10707,7 @@
},
"usetype": 13,
"color": 2,
"bagtype": 1,
"bagtype": 4,
"index": 9,
"special_type": 0,
"time": 0,
@ -10751,7 +10751,7 @@
},
"usetype": 13,
"color": 2,
"bagtype": 1,
"bagtype": 4,
"index": 10,
"special_type": 0,
"time": 0,
@ -10795,7 +10795,7 @@
},
"usetype": 13,
"color": 2,
"bagtype": 1,
"bagtype": 4,
"index": 11,
"special_type": 0,
"time": 0,
@ -10839,7 +10839,7 @@
},
"usetype": 13,
"color": 2,
"bagtype": 1,
"bagtype": 4,
"index": 12,
"special_type": 0,
"time": 0,
@ -10883,7 +10883,7 @@
},
"usetype": 13,
"color": 2,
"bagtype": 1,
"bagtype": 4,
"index": 13,
"special_type": 0,
"time": 0,

6
bin/json/game_rdtaskcondi.json
View File

@ -722,10 +722,10 @@
{
"id": 161,
"type_sp": 1,
"tasktxt": "通关主线章节1-6",
"tasktxt": "通关主线章节1-5",
"type": 61,
"valid": 0,
"data1": 1100106,
"data1": 1100105,
"data2": 0,
"data3": 0,
"data4": 0,
@ -4254,7 +4254,7 @@
"type": 20001,
"valid": 1,
"data1": 1,
"data2": 3001,
"data2": 432,
"data3": 0,
"data4": 0,
"data5": 10021

2
bin/json/game_rdtasknpc.json
View File

@ -112,7 +112,7 @@
],
"event": [
2,
500
432
],
"goto": 0
},

2
bin/json/game_worldall.json
View File

@ -1,6 +1,6 @@
[
{
"组id": 2,
"id": 2,
"name": {
"key": "mainline_name_10001",
"text": "章节1全部任务"

4
bin/json/game_worldtask.json
View File

@ -179,8 +179,8 @@
"lock": 1,
"ontxe": 20050,
"id_after": 0,
"group": 3,
"des": 3,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",

4
modules/gourmet/api_activateatlas.go
View File

@ -33,13 +33,13 @@ func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetAct
code = pb.ErrorCode_DBError
return
}
if v, ok := _gourmet.Atlas[req.Cid]; ok && v == -1 {
if v, ok := _gourmet.Atlas[req.Cid]; !ok || v != -1 {
code = pb.ErrorCode_ReqParameterError
return
}
_gourmet.Atlas[req.Cid] = 1
if err := this.module.modelAtlas.Change(session.GetUserId(), map[string]interface{}{
"atlas": _gourmet.Atlas[req.Cid],
"atlas": _gourmet.Atlas,
}); err != nil {
this.module.Errorf("change modelAtlas failed: %v", err)
}

2
modules/gourmet/comp_configure.go
View File

@ -93,7 +93,7 @@ func (this *configureComp) SetGrormetCookBookConf() {
if v, err := this.GetConfigure(game_food); err == nil {
if conf, ok := v.(*cfg.GameBreakingbad); ok {
for _, v1 := range conf.GetDataList() {
if v1.Type == 1 {
if v1.Type == -1 {
this.normal = v1.Delicacies
return
}

1
modules/gourmet/model_food.go
View File

@ -37,7 +37,6 @@ func (this *modelAtlas) getGourmetAtlasList(uid string) (result *pb.DBGourmetAtl
result.Uid = uid
result.Atlas = make(map[string]int32)
}
return
}
err = nil
return result, err

223
sys/configure/structs/Game.PotionsData.go
View File

@ -11,178 +11,89 @@ package cfg
import "errors"
type GamePotionsData struct {
Id int32
Describe string
Type int32
Material []*Gameatn
StandardYield []*Gameatn
LowYield []*Gameatn
HighYield []*Gameatn
Id int32
Describe string
Type int32
Material []*Gameatn
StandardYield []*Gameatn
LowYield []*Gameatn
HighYield []*Gameatn
}
const TypeId_GamePotionsData = 844054798
func (*GamePotionsData) GetTypeId() int32 {
return 844054798
return 844054798
}
func (_v *GamePotionsData) Deserialize(_buf map[string]interface{}) (err error) {
{
var _ok_ bool
var _tempNum_ float64
if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ {
err = errors.New("id error")
return
}
_v.Id = int32(_tempNum_)
}
{
var _ok_ bool
var __json_text__ map[string]interface{}
if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}); !_ok_ {
err = errors.New("_v.Describe error")
return
}
{
var _ok_ bool
if _, _ok_ = __json_text__["key"].(string); !_ok_ {
err = errors.New("key error")
return
}
}
{
var _ok_ bool
if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ {
err = errors.New("text error")
return
}
}
}
{
var _ok_ bool
var _tempNum_ float64
if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ {
err = errors.New("type error")
return
}
_v.Type = int32(_tempNum_)
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["material"].([]interface{}); !_ok_ {
err = errors.New("material error")
return
}
func (_v *GamePotionsData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["material"].([]interface{}); !_ok_ { err = errors.New("material error"); return }
_v.Material = make([]*Gameatn, 0, len(_arr_))
_v.Material = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Material = append(_v.Material, _list_v_)
}
}
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{
var _ok_ bool
var _x_ map[string]interface{}
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
err = errors.New("_list_v_ error")
return
}
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
return
}
}
_v.Material = append(_v.Material, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["standard_yield"].([]interface{}); !_ok_ { err = errors.New("standard_yield error"); return }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["standard_yield"].([]interface{}); !_ok_ {
err = errors.New("standard_yield error")
return
}
_v.StandardYield = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.StandardYield = append(_v.StandardYield, _list_v_)
}
}
_v.StandardYield = make([]*Gameatn, 0, len(_arr_))
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["low_yield"].([]interface{}); !_ok_ { err = errors.New("low_yield error"); return }
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{
var _ok_ bool
var _x_ map[string]interface{}
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
err = errors.New("_list_v_ error")
return
}
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
return
}
}
_v.StandardYield = append(_v.StandardYield, _list_v_)
}
}
_v.LowYield = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.LowYield = append(_v.LowYield, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["low_yield"].([]interface{}); !_ok_ {
err = errors.New("low_yield error")
return
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["high_yield"].([]interface{}); !_ok_ { err = errors.New("high_yield error"); return }
_v.LowYield = make([]*Gameatn, 0, len(_arr_))
_v.HighYield = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.HighYield = append(_v.HighYield, _list_v_)
}
}
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{
var _ok_ bool
var _x_ map[string]interface{}
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
err = errors.New("_list_v_ error")
return
}
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
return
}
}
_v.LowYield = append(_v.LowYield, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["high_yield"].([]interface{}); !_ok_ {
err = errors.New("high_yield error")
return
}
_v.HighYield = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{
var _ok_ bool
var _x_ map[string]interface{}
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
err = errors.New("_list_v_ error")
return
}
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
return
}
}
_v.HighYield = append(_v.HighYield, _list_v_)
}
}
return
return
}
func DeserializeGamePotionsData(_buf map[string]interface{}) (*GamePotionsData, error) {
v := &GamePotionsData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
v := &GamePotionsData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

2
sys/configure/structs/Game.WorldAll.go
View File

@ -21,7 +21,7 @@ func NewGameWorldAll(_buf []map[string]interface{}) (*GameWorldAll, error) {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.组id] = _v
dataMap[_v.Id] = _v
}
}
return &GameWorldAll{_dataList:_dataList, _dataMap:dataMap}, nil

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

@ -11,7 +11,7 @@ package cfg
import "errors"
type GameWorldAllData struct {
组id int32
Id int32
Name string
TaskIcon string
TaskTxt string
@ -25,7 +25,7 @@ func (*GameWorldAllData) GetTypeId() int32 {
}
func (_v *GameWorldAllData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["组id"].(float64); !_ok_ { err = errors.New("组id error"); return }; _v.组id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{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 } } }
{ var _ok_ bool; if _v.TaskIcon, _ok_ = _buf["task_icon"].(string); !_ok_ { err = errors.New("task_icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }