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

上传星阵图

Browse Source
This commit is contained in:
liwei1dao 2023-05-25 17:16:12 +08:00
parent ff3cc52b3a
commit d3f537f229
8 changed files with 3107 additions and 3725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5634
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

480
bin/json/game_huntingboss.json
View File

@ -34,16 +34,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 5
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -82,16 +82,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -130,16 +130,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -178,16 +178,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -226,16 +226,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -274,16 +274,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -322,16 +322,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -370,16 +370,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -418,16 +418,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -466,16 +466,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 15
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -514,16 +514,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 5
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -562,16 +562,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -610,16 +610,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -658,16 +658,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -706,16 +706,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -754,16 +754,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -802,16 +802,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -850,16 +850,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -898,16 +898,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -946,16 +946,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 15
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -994,16 +994,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 5
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1042,16 +1042,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1090,16 +1090,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1138,16 +1138,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1186,16 +1186,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1234,16 +1234,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1282,16 +1282,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1330,16 +1330,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1378,16 +1378,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1426,16 +1426,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 15
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1474,16 +1474,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 5
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1522,16 +1522,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 6
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1570,16 +1570,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 7
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1618,16 +1618,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 8
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1666,16 +1666,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 9
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1714,16 +1714,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 10
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1762,16 +1762,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 11
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1810,16 +1810,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 12
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1858,16 +1858,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 13
"a": "attr",
"t": "ps",
"n": 1
}
]
},
@ -1906,16 +1906,16 @@
],
"ps_consume": [
{
"a": "item",
"t": "100100",
"n": 15
"a": "attr",
"t": "ps",
"n": 5
}
],
"ps_mg": [
{
"a": "item",
"t": "100100",
"n": 14
"a": "attr",
"t": "ps",
"n": 1
}
]
}

12
bin/json/game_rdtaskcondi.json
View File

@ -6402,9 +6402,9 @@
"type": 168,
"valid": 0,
"NPC": 10231,
"data1": 1,
"data2": 5,
"data3": 1,
"data1": 5,
"data2": 1,
"data3": 0,
"data4": 0,
"data5": 0
},
@ -12488,9 +12488,9 @@
"type": 168,
"valid": 0,
"NPC": 0,
"data1": 1,
"data2": 5,
"data3": 1,
"data1": 5,
"data2": 1,
"data3": 0,
"data4": 0,
"data5": 0
},

644
bin/json/game_vikingboss.json
View File

File diff suppressed because it is too large Load Diff

18
modules/horoscope/api_upgrade.go
View File

@ -32,14 +32,16 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade
return
}
if conf.CostItem != nil && len(conf.CostItem) > 0 { //可有升级
if conf.Front > 0 {
if front, err = this.module.configure.getHoroscope(conf.Front); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if v, ok := info.Nodes[front.NodeId]; !ok || v < front.Lv {
code = pb.ErrorCode_HoroscopeNotTurnedOn
return
for _, _front := range conf.Front {
if _front > 0 {
if front, err = this.module.configure.getHoroscope(_front); err != nil {
code = pb.ErrorCode_ConfigNoFound
return
}
if v, ok := info.Nodes[front.NodeId]; !ok || v < front.Lv {
code = pb.ErrorCode_HoroscopeNotTurnedOn
return
}
}
}
} else {

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

@ -81,4 +81,6 @@ const (
GameBuffType_INNOCENCE = 69
GameBuffType_FANGS = 70
GameBuffType_HACKER_FORESIGHT = 71
GameBuffType_FROST_STONE = 72
GameBuffType_BLEED = 73
)

35
sys/configure/structs/Game.HoroscopeData.go
View File

@ -13,11 +13,13 @@ import "errors"
type GameHoroscopeData struct {
Id int32
Type int32
TypeName string
GrowType int32
NodeId int32
Front []int32
NodeType int32
PreNode int32
NodeDirection int32
NodeLong int32
Name string
Icon string
Comicon string
Lv int32
CostItem []*Gameatn
@ -25,9 +27,6 @@ type GameHoroscopeData struct {
AddClassify int32
Text string
Upgrade []*Gameatr
Position string
Front int32
Behind string
}
const TypeId_GameHoroscopeData = 1230895646
@ -39,11 +38,26 @@ func (*GameHoroscopeData) GetTypeId() int32 {
func (_v *GameHoroscopeData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["type_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TypeName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TypeName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["grow_type"].(float64); !_ok_ { err = errors.New("grow_type error"); return }; _v.GrowType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_id"].(float64); !_ok_ { err = errors.New("node_id error"); return }; _v.NodeId = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["front"].([]interface{}); !_ok_ { err = errors.New("front error"); return }
_v.Front = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Front = append(_v.Front, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_type"].(float64); !_ok_ { err = errors.New("node_type error"); return }; _v.NodeType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pre_node"].(float64); !_ok_ { err = errors.New("pre_node error"); return }; _v.PreNode = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_direction"].(float64); !_ok_ { err = errors.New("node_direction error"); return }; _v.NodeDirection = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["node_long"].(float64); !_ok_ { err = errors.New("node_long error"); return }; _v.NodeLong = 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.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; if _v.Comicon, _ok_ = _buf["comicon"].(string); !_ok_ { err = errors.New("comicon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{
@ -77,9 +91,6 @@ func (_v *GameHoroscopeData)Deserialize(_buf map[string]interface{}) (err error)
}
}
{ var _ok_ bool; if _v.Position, _ok_ = _buf["position"].(string); !_ok_ { err = errors.New("position error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["front"].(float64); !_ok_ { err = errors.New("front error"); return }; _v.Front = int32(_tempNum_) }
{ var _ok_ bool; if _v.Behind, _ok_ = _buf["behind"].(string); !_ok_ { err = errors.New("behind error"); return } }
return
}

7
sys/configure/structs/Tables.go
View File

@ -196,7 +196,6 @@ type Tables struct {
RuleDesc *GameRuleDesc
HeroTalent *GameHeroTalent
TalentBox *GameTalentBox
BuriedCondi *GameBuriedCondi
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -1314,11 +1313,5 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.TalentBox, err = NewGameTalentBox(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_buriedcondi") ; err != nil {
return nil, err
}
if tables.BuriedCondi, err = NewGameBuriedCondi(buf) ; err != nil {
return nil, err
}
return tables, nil
}