diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 80cefbaaf..e1ca23070 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -280,9 +280,9 @@ ], "run_horsetime1": 3, "run_horsetime2": 10, - "boy_headPortrait": "action_44006", - "girl_headPortrait": "action_11011", - "namecolor": "#000080", + "boy_headPortrait": "ytx_js_45003", + "girl_headPortrait": "action_44005", + "namecolor": "#FFFF00", "skillGetLocation": [ 114 ], @@ -295,6 +295,16 @@ 10 ], "DrawCard_ContinuousRestriction_Star5": 20, - "DrawCard_ContinuousRestriction_Camp": 2 + "DrawCard_ContinuousRestriction_Camp": 2, + "EquipmentConsumption": [ + 1000, + 2000, + 3000, + 4000, + 5000, + 6000 + ], + "DrawCard_supplement1": 1000001, + "DrawCard_supplement10": 1000002 } ] \ No newline at end of file diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index c98bea8e5..741357753 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -138,6 +138,9 @@ type GameGlobalData struct { DrawCardRegressionReward []int32 DrawCardContinuousRestrictionStar5 int32 DrawCardContinuousRestrictionCamp int32 + EquipmentConsumption []int32 + DrawCardSupplement1 int32 + DrawCardSupplement10 int32 } const TypeId_GameGlobalData = 477542761 @@ -560,6 +563,22 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["EquipmentConsumption"].([]interface{}); !_ok_ { err = errors.New("EquipmentConsumption error"); return } + + _v.EquipmentConsumption = 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.EquipmentConsumption = append(_v.EquipmentConsumption, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_supplement1"].(float64); !_ok_ { err = errors.New("DrawCard_supplement1 error"); return }; _v.DrawCardSupplement1 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_supplement10"].(float64); !_ok_ { err = errors.New("DrawCard_supplement10 error"); return }; _v.DrawCardSupplement10 = int32(_tempNum_) } return }