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

上传分解合成代码补充

Browse Source
This commit is contained in:
liwei1dao 2023-06-08 09:51:26 +08:00
parent 7779fa6bb2
commit 6983411410
13 changed files with 33098 additions and 12448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bin/json/game_battleready.json
View File

@ -3,7 +3,7 @@
"id": 100,
"PlayType": 3,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -19,7 +19,7 @@
"id": 101,
"PlayType": 6,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -51,7 +51,7 @@
"id": 103,
"PlayType": 2,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_05",
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
"scenesfight_06"
],
@ -83,7 +83,7 @@
"id": 105,
"PlayType": 7,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -99,7 +99,7 @@
"id": 106,
"PlayType": 8,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -131,7 +131,7 @@
"id": 108,
"PlayType": 11,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -147,7 +147,7 @@
"id": 109,
"PlayType": 10,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -163,7 +163,7 @@
"id": 110,
"PlayType": 14,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -179,7 +179,7 @@
"id": 111,
"PlayType": 13,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -195,7 +195,7 @@
"id": 112,
"PlayType": 2,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -211,7 +211,7 @@
"id": 113,
"PlayType": 9,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -227,7 +227,7 @@
"id": 114,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -243,7 +243,7 @@
"id": 115,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_05",
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
"scenesfight_06"
],
@ -259,7 +259,7 @@
"id": 116,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_06",
"readyScene": "scenesfight_role_interface_05",
"battleScenes": [
"scenesfight_07"
],
@ -275,7 +275,7 @@
"id": 117,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_05",
"readyScene": "scenesfight_role_interface_06",
"battleScenes": [
"scenesfight_06"
],
@ -366,5 +366,37 @@
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 123,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_chef_01"
],
"disableAiCamera": 1,
"DefaultHero": 0,
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 124,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_spinymandrilla_03"
],
"disableAiCamera": 1,
"DefaultHero": 0,
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
}
]

5132
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_buriedtype.json
View File

@ -1022,7 +1022,9 @@
{
"id": 169,
"insert": 1,
"filter": []
"filter": [
"eq"
]
},
{
"id": 170,

25200
bin/json/game_drop.json
View File

File diff suppressed because it is too large Load Diff

38
bin/json/game_equipsuit.json
View File

@ -1,7 +1,7 @@
[
{
"suittype": 1,
"suitnum": 6,
"suitnum": 4,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_1",
@ -26,7 +26,7 @@
},
{
"suittype": 2,
"suitnum": 6,
"suitnum": 4,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_2",
@ -51,7 +51,7 @@
},
{
"suittype": 3,
"suitnum": 6,
"suitnum": 4,
"skill": 100003001,
"skillname": {
"key": "equip_equip_suit_skillname_3",
@ -71,7 +71,7 @@
},
{
"suittype": 4,
"suitnum": 6,
"suitnum": 4,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_4",
@ -96,7 +96,7 @@
},
{
"suittype": 5,
"suitnum": 6,
"suitnum": 4,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_5",
@ -121,7 +121,7 @@
},
{
"suittype": 6,
"suitnum": 6,
"suitnum": 4,
"skill": 100006001,
"skillname": {
"key": "equip_equip_suit_skillname_6",
@ -141,7 +141,7 @@
},
{
"suittype": 7,
"suitnum": 6,
"suitnum": 4,
"skill": 100007001,
"skillname": {
"key": "equip_equip_suit_skillname_7",
@ -161,7 +161,7 @@
},
{
"suittype": 8,
"suitnum": 6,
"suitnum": 4,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_8",
@ -186,7 +186,7 @@
},
{
"suittype": 9,
"suitnum": 6,
"suitnum": 4,
"skill": 100009001,
"skillname": {
"key": "equip_equip_suit_skillname_9",
@ -206,7 +206,7 @@
},
{
"suittype": 10,
"suitnum": 6,
"suitnum": 2,
"skill": 100001001,
"skillname": {
"key": "equip_equip_suit_skillname_10",
@ -226,7 +226,7 @@
},
{
"suittype": 11,
"suitnum": 6,
"suitnum": 2,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_11",
@ -251,7 +251,7 @@
},
{
"suittype": 12,
"suitnum": 6,
"suitnum": 2,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_12",
@ -276,7 +276,7 @@
},
{
"suittype": 13,
"suitnum": 6,
"suitnum": 2,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_13",
@ -301,7 +301,7 @@
},
{
"suittype": 14,
"suitnum": 6,
"suitnum": 2,
"skill": 100001401,
"skillname": {
"key": "equip_equip_suit_skillname_14",
@ -321,7 +321,7 @@
},
{
"suittype": 15,
"suitnum": 6,
"suitnum": 2,
"skill": 100001501,
"skillname": {
"key": "equip_equip_suit_skillname_15",
@ -341,7 +341,7 @@
},
{
"suittype": 16,
"suitnum": 6,
"suitnum": 2,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_16",
@ -366,7 +366,7 @@
},
{
"suittype": 17,
"suitnum": 6,
"suitnum": 2,
"skill": 100001701,
"skillname": {
"key": "equip_equip_suit_skillname_17",
@ -386,7 +386,7 @@
},
{
"suittype": 18,
"suitnum": 6,
"suitnum": 2,
"skill": 0,
"skillname": {
"key": "equip_equip_suit_skillname_18",
@ -411,7 +411,7 @@
},
{
"suittype": 19,
"suitnum": 6,
"suitnum": 2,
"skill": 100001901,
"skillname": {
"key": "equip_equip_suit_skillname_19",

2288
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

3450
bin/json/game_newsmithy.json
View File

File diff suppressed because it is too large Load Diff

10
bin/json/game_skillafteratk.json
View File

@ -17583,7 +17583,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001006,
390001103,
1000,
1,
1
@ -17607,7 +17607,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001006,
390001127,
1000,
1,
1
@ -17633,7 +17633,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001006,
390001127,
1000,
1,
1
@ -19626,7 +19626,7 @@
{
"Id": 224001111,
"EmitPR": 1000,
"From": 2,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@ -20927,7 +20927,7 @@
{
"Id": 255005212,
"EmitPR": 1000,
"From": 2,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,

4044
bin/json/game_smithyproficiency.json
View File

File diff suppressed because it is too large Load Diff

117
bin/json/game_worldbattle.json
View File

@ -180,5 +180,122 @@
"t": "exp",
"n": 1000
}
},
{
"id": 115,
"FormatList": [
700025
],
"BattleReadyID": 101,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1001
}
},
{
"id": 116,
"FormatList": [
700026
],
"BattleReadyID": 102,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1002
}
},
{
"id": 117,
"FormatList": [
700027
],
"BattleReadyID": 103,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1003
}
},
{
"id": 118,
"FormatList": [
700028
],
"BattleReadyID": 104,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1004
}
},
{
"id": 119,
"FormatList": [
700029
],
"BattleReadyID": 105,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1005
}
},
{
"id": 120,
"FormatList": [
700030
],
"BattleReadyID": 106,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1006
}
},
{
"id": 121,
"FormatList": [
700031
],
"BattleReadyID": 107,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1007
}
},
{
"id": 122,
"FormatList": [
700032
],
"BattleReadyID": 108,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1008
}
},
{
"id": 123,
"FormatList": [
700033
],
"BattleReadyID": 109,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1009
}
}
]

5050
bin/json/game_worldtask.json
View File

File diff suppressed because it is too large Load Diff

59
modules/items/api_useItem.go
View File

@ -118,13 +118,11 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
}
case itemuse_synthesis: //合成/分解
if req.Select == 0 { // 合成
user := this.module.ModuleUser.GetUser(session.GetUserId())
reward := this.module.ModuleTools.GetGroupDataByLottery(itemcf.BoxId, user.Vip, user.Lv) // 走新的掉落
if reward == nil {
if itemcf.SynthetizeGet == nil || len(itemcf.SynthetizeGet) == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: fmt.Sprintf("掉落组未找到:%d", itemcf.BoxId),
Message: fmt.Sprintf("道具合成未配置! 道具id:%s ", itemcf.Id),
}
return
}
@ -152,7 +150,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
return
}
sale = make([]*cfg.Gameatn, 0, len(prop))
for _, v1 := range reward {
for _, v1 := range itemcf.SynthetizeGet {
sale = append(sale, &cfg.Gameatn{
A: v1.A,
T: v1.T,
@ -163,42 +161,41 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
return
}
} else {
if item, err = this.module.modelItems.QueryUserPackByGridId(session.GetUserId(), req.GridId); err != nil {
if itemcf.DecomposeGet == nil || len(itemcf.DecomposeGet) == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: err.Error(),
}
return
}
if itemcf, err = this.module.configure.GetItemConfigure(item.ItemId); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigurationException,
Title: pb.ErrorCode_ConfigurationException.ToString(),
Message: err.Error(),
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: fmt.Sprintf("道具分解未配置! 道具id:%s ", itemcf.Id),
}
return
}
if itemcf.DecomposeDeplete == nil || len(itemcf.DecomposeDeplete) == 0 {
if itemcf.SynthetizeNum*int32(req.Amount) > int32(item.Amount) { //碎片数量不够
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ItemsUseNoCanSell,
Title: pb.ErrorCode_ItemsUseNoCanSell.ToString(),
Message: fmt.Sprintf("道具分解配置未配置! 道具id:%s", itemcf.Id),
Code: pb.ErrorCode_ItemsNoEnough,
Title: pb.ErrorCode_ItemsNoEnough.ToString(),
Message: fmt.Sprintf("道具Id:%s", itemcf.Id),
}
return
}
if req.Amount > item.Amount {
this.module.Errorf("SellItemCheck over all amount:[%d:%d]", req.Amount, item.Amount)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: fmt.Sprintf("道具数量不足! 道具数量:%d", item.Amount),
sale := make([]*cfg.Gameatn, 0, len(itemcf.DecomposeDeplete))
for _, v := range itemcf.DecomposeDeplete {
sale = append(sale, &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N * int32(req.Amount),
})
}
if errdata = this.module.ConsumeRes(session, sale, true); errdata != nil {
return
}
sale := make([]*cfg.Gameatn, len(itemcf.Sale))
for i, v := range itemcf.DecomposeDeplete {
if errdata = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil {
return
}
sale = make([]*cfg.Gameatn, len(itemcf.Sale))
for i, v := range itemcf.DecomposeGet {
temp := *v
sale[i] = &temp
sale[i].N = v.N * int32(req.Amount)
@ -206,10 +203,6 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
if errdata = this.module.DispenseRes(session, sale, true); errdata != nil {
return
}
item.Amount = item.Amount - req.Amount
if errdata = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); errdata != nil {
return
}
}
default:
errdata = &pb.ErrorData{

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

@ -24,14 +24,16 @@ type GameItemData struct {
ModelName string
BoxId int32
SynthetizeNum int32
SynthetizeDeplete []*Gameatn
SynthetizeGet []*Gameatn
DecomposeDeplete []*Gameatn
DecomposeGet []*Gameatn
Access []int32
UseSkip int32
UpperLimit int32
Img string
Intr string
Sale []*Gameatn
SynthetizeDeplete []*Gameatn
DecomposeDeplete []*Gameatn
}
const TypeId_GameItemData = -984700967
@ -54,6 +56,62 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.ModelName, _ok_ = _buf["modelName"].(string); !_ok_ { err = errors.New("modelName error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["box_id"].(float64); !_ok_ { err = errors.New("box_id error"); return }; _v.BoxId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["synthetize_num"].(float64); !_ok_ { err = errors.New("synthetize_num error"); return }; _v.SynthetizeNum = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["synthetize_deplete"].([]interface{}); !_ok_ { err = errors.New("synthetize_deplete error"); return }
_v.SynthetizeDeplete = 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.SynthetizeDeplete = append(_v.SynthetizeDeplete, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["synthetize_get"].([]interface{}); !_ok_ { err = errors.New("synthetize_get error"); return }
_v.SynthetizeGet = 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.SynthetizeGet = append(_v.SynthetizeGet, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["decompose_deplete"].([]interface{}); !_ok_ { err = errors.New("decompose_deplete error"); return }
_v.DecomposeDeplete = 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.DecomposeDeplete = append(_v.DecomposeDeplete, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["decompose_get"].([]interface{}); !_ok_ { err = errors.New("decompose_get error"); return }
_v.DecomposeGet = 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.DecomposeGet = append(_v.DecomposeGet, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
@ -86,34 +144,6 @@ func (_v *GameItemData)Deserialize(_buf map[string]interface{}) (err error) {
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["synthetize_deplete"].([]interface{}); !_ok_ { err = errors.New("synthetize_deplete error"); return }
_v.SynthetizeDeplete = 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.SynthetizeDeplete = append(_v.SynthetizeDeplete, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["decompose_deplete"].([]interface{}); !_ok_ { err = errors.New("decompose_deplete error"); return }
_v.DecomposeDeplete = 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.DecomposeDeplete = append(_v.DecomposeDeplete, _list_v_)
}
}
return
}