diff --git a/bin/json/game_privilege.json b/bin/json/game_privilege.json index 9c3a63eeb..245465760 100644 --- a/bin/json/game_privilege.json +++ b/bin/json/game_privilege.json @@ -1,44 +1,79 @@ [ { "privilege_id": 10001, - "privilege_describe": { - "key": "privilegecard_10001", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10001", + "text": "特权描述1" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10001", "text": "特权描述1" } }, { "privilege_id": 10002, - "privilege_describe": { - "key": "privilegecard_10002", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10002", + "text": "特权描述2" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10002", "text": "特权描述2" } }, { "privilege_id": 10003, - "privilege_describe": { - "key": "privilegecard_10003", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10003", + "text": "特权描述3" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10003", "text": "特权描述3" } }, { "privilege_id": 10004, - "privilege_describe": { - "key": "privilegecard_10004", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10004", + "text": "特权描述4" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10004", "text": "特权描述4" } }, { "privilege_id": 10005, - "privilege_describe": { - "key": "privilegecard_10005", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10005", + "text": "特权描述5" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10005", "text": "特权描述5" } }, { "privilege_id": 10006, - "privilege_describe": { - "key": "privilegecard_10006", + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10006", "text": "特权描述6" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10006", + "text": "特权描述6" + } + }, + { + "privilege_id": 10007, + "privilege_DescribeFront": { + "key": "PrivilegeCardFront_10007", + "text": "特权描述7" + }, + "privilege_DescribeAfter": { + "key": "PrivilegeCardAfter_10007", + "text": "特权描述7" } } ] \ No newline at end of file diff --git a/bin/json/game_privilegecard.json b/bin/json/game_privilegecard.json index 8958c0ea6..a640f6cc0 100644 --- a/bin/json/game_privilegecard.json +++ b/bin/json/game_privilegecard.json @@ -11,11 +11,13 @@ "n": 60 } ], - "disposable_reward": { - "a": "attr", - "t": "diamond", - "n": 300 - }, + "disposable_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ], "privilege_id": [ 10001, 10002, @@ -34,15 +36,28 @@ "n": 90 } ], - "disposable_reward": { - "a": "attr", - "t": "diamond", - "n": 980 - }, + "disposable_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 980 + } + ], "privilege_id": [ 10004, 10005, 10006 ] + }, + { + "id": "passcheck_1", + "name": "爬塔战令", + "assert_day": 30, + "renew_day": 0, + "day_reward": [], + "disposable_reward": [], + "privilege_id": [ + 10007 + ] } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.PrivilegeCardData.go b/sys/configure/structs/Game.PrivilegeCardData.go index 9644b5989..76b9c4793 100644 --- a/sys/configure/structs/Game.PrivilegeCardData.go +++ b/sys/configure/structs/Game.PrivilegeCardData.go @@ -16,7 +16,7 @@ type GamePrivilegeCardData struct { AssertDay int32 RenewDay int32 DayReward []*Gameatn - DisposableReward *Gameatn + DisposableReward []*Gameatn PrivilegeId []int32 } @@ -45,7 +45,20 @@ func (_v *GamePrivilegeCardData)Deserialize(_buf map[string]interface{}) (err er } } - { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["disposable_reward"].(map[string]interface{}); !_ok_ { err = errors.New("disposable_reward error"); return }; if _v.DisposableReward, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["disposable_reward"].([]interface{}); !_ok_ { err = errors.New("disposable_reward error"); return } + + _v.DisposableReward = 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.DisposableReward = append(_v.DisposableReward, _list_v_) + } + } + { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.PrivilegeData.go b/sys/configure/structs/Game.PrivilegeData.go index cfbc9f5a4..94bc9a1ef 100644 --- a/sys/configure/structs/Game.PrivilegeData.go +++ b/sys/configure/structs/Game.PrivilegeData.go @@ -12,7 +12,8 @@ import "errors" type GamePrivilegeData struct { PrivilegeId int32 - PrivilegeDescribe string + PrivilegeDescribeFront string + PrivilegeDescribeAfter string } const TypeId_GamePrivilegeData = 40320255 @@ -23,7 +24,8 @@ func (*GamePrivilegeData) GetTypeId() int32 { func (_v *GamePrivilegeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_id"].(float64); !_ok_ { err = errors.New("privilege_id error"); return }; _v.PrivilegeId = int32(_tempNum_) } - {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["privilege_describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrivilegeDescribe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrivilegeDescribe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["privilege_DescribeFront"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrivilegeDescribeFront error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrivilegeDescribeFront, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["privilege_DescribeAfter"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrivilegeDescribeAfter error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrivilegeDescribeAfter, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return }