diff --git a/bin/json/game_exclusiverank.json b/bin/json/game_exclusiverank.json index 84434b115..90d8d8426 100644 --- a/bin/json/game_exclusiverank.json +++ b/bin/json/game_exclusiverank.json @@ -1,14 +1,14 @@ [ { "id": 1, - "weaponid": 100001, + "weaponid": "100001", "rank": 1, "lvmax": 10, "cost": [] }, { "id": 2, - "weaponid": 100001, + "weaponid": "100001", "rank": 2, "lvmax": 20, "cost": [ @@ -21,7 +21,7 @@ }, { "id": 3, - "weaponid": 100001, + "weaponid": "100001", "rank": 3, "lvmax": 30, "cost": [ @@ -34,7 +34,7 @@ }, { "id": 4, - "weaponid": 100001, + "weaponid": "100001", "rank": 4, "lvmax": 40, "cost": [ @@ -47,7 +47,7 @@ }, { "id": 5, - "weaponid": 100001, + "weaponid": "100001", "rank": 5, "lvmax": 50, "cost": [ @@ -60,7 +60,7 @@ }, { "id": 6, - "weaponid": 100001, + "weaponid": "100001", "rank": 6, "lvmax": 60, "cost": [ diff --git a/bin/json/game_exclusivestar.json b/bin/json/game_exclusivestar.json index e55619377..13fc856a3 100644 --- a/bin/json/game_exclusivestar.json +++ b/bin/json/game_exclusivestar.json @@ -1,60 +1,60 @@ [ { "id": 1, - "weaponid": 100001, + "weaponid": "100001", "star": 1, "commonskill": 10001, "exclusiveskill": 20001, "cost1": { - "a": "ExclusiveWeapon", + "a": "exw", "t": "100001", "n": 0 } }, { "id": 2, - "weaponid": 100001, + "weaponid": "100001", "star": 2, "commonskill": 10002, "exclusiveskill": 20002, "cost1": { - "a": "ExclusiveWeapon", + "a": "exw", "t": "100001", "n": 1 } }, { "id": 3, - "weaponid": 100001, + "weaponid": "100001", "star": 3, "commonskill": 10003, "exclusiveskill": 20003, "cost1": { - "a": "ExclusiveWeapon", + "a": "exw", "t": "100001", "n": 1 } }, { "id": 4, - "weaponid": 100001, + "weaponid": "100001", "star": 4, "commonskill": 10004, "exclusiveskill": 20004, "cost1": { - "a": "ExclusiveWeapon", + "a": "exw", "t": "100001", "n": 1 } }, { "id": 5, - "weaponid": 100001, + "weaponid": "100001", "star": 5, "commonskill": 10005, "exclusiveskill": 20005, "cost1": { - "a": "ExclusiveWeapon", + "a": "exw", "t": "100001", "n": 1 } diff --git a/bin/json/game_exclusiveupgrade.json b/bin/json/game_exclusiveupgrade.json index a280bc269..7ddf45262 100644 --- a/bin/json/game_exclusiveupgrade.json +++ b/bin/json/game_exclusiveupgrade.json @@ -1,7 +1,7 @@ [ { "id": 1, - "weaponid": 100001, + "weaponid": "100001", "lv": 1, "attribute": [ { @@ -19,7 +19,7 @@ }, { "id": 2, - "weaponid": 100001, + "weaponid": "100001", "lv": 2, "attribute": [ { @@ -43,7 +43,7 @@ }, { "id": 3, - "weaponid": 100001, + "weaponid": "100001", "lv": 3, "attribute": [ { @@ -67,7 +67,7 @@ }, { "id": 4, - "weaponid": 100001, + "weaponid": "100001", "lv": 4, "attribute": [ { @@ -91,7 +91,7 @@ }, { "id": 5, - "weaponid": 100001, + "weaponid": "100001", "lv": 5, "attribute": [ { @@ -115,7 +115,7 @@ }, { "id": 6, - "weaponid": 100001, + "weaponid": "100001", "lv": 6, "attribute": [ { @@ -139,7 +139,7 @@ }, { "id": 7, - "weaponid": 100001, + "weaponid": "100001", "lv": 7, "attribute": [ { @@ -163,7 +163,7 @@ }, { "id": 8, - "weaponid": 100001, + "weaponid": "100001", "lv": 8, "attribute": [ { @@ -187,7 +187,7 @@ }, { "id": 9, - "weaponid": 100001, + "weaponid": "100001", "lv": 9, "attribute": [ { @@ -211,7 +211,7 @@ }, { "id": 10, - "weaponid": 100001, + "weaponid": "100001", "lv": 10, "attribute": [ { diff --git a/bin/json/game_exclusiveweapon.json b/bin/json/game_exclusiveweapon.json index b215c279d..a070a6e03 100644 --- a/bin/json/game_exclusiveweapon.json +++ b/bin/json/game_exclusiveweapon.json @@ -1,6 +1,6 @@ [ { - "weaponid": 100001, + "weaponid": "100001", "heroid": 25001, "name": { "key": "text01", @@ -22,7 +22,7 @@ "exclusiveskill": 35000001 }, { - "weaponid": 100002, + "weaponid": "100002", "heroid": 25002, "name": { "key": "text02", @@ -44,7 +44,7 @@ "exclusiveskill": 35000002 }, { - "weaponid": 100003, + "weaponid": "100003", "heroid": 25003, "name": { "key": "text03", @@ -57,7 +57,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100004, + "weaponid": "100004", "heroid": 25004, "name": { "key": "text04", @@ -70,7 +70,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100005, + "weaponid": "100005", "heroid": 25005, "name": { "key": "text05", @@ -83,7 +83,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100006, + "weaponid": "100006", "heroid": 25006, "name": { "key": "text06", @@ -96,7 +96,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100007, + "weaponid": "100007", "heroid": 25007, "name": { "key": "text07", @@ -109,7 +109,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100008, + "weaponid": "100008", "heroid": 25008, "name": { "key": "text08", @@ -122,7 +122,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100009, + "weaponid": "100009", "heroid": 25009, "name": { "key": "text09", @@ -135,7 +135,7 @@ "exclusiveskill": 0 }, { - "weaponid": 100010, + "weaponid": "100010", "heroid": 25010, "name": { "key": "text10", diff --git a/bin/json/game_reddot.json b/bin/json/game_reddot.json index ff25b148c..ae938bb18 100644 --- a/bin/json/game_reddot.json +++ b/bin/json/game_reddot.json @@ -392,7 +392,7 @@ "count_type": 0, "opencond_id": "", "opencond": [], - "path": "Root|Bag|Equip", + "path": "Root|Bag|Item|New", "header": "赵长远" }, { @@ -402,7 +402,7 @@ "count_type": 0, "opencond_id": "", "opencond": [], - "path": "Root|Bag|Shard", + "path": "Root|Bag|Item|Operational", "header": "赵长远" }, { @@ -557,7 +557,7 @@ }, { "id": 18105, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "opencond_id": "kungfu", @@ -587,7 +587,7 @@ }, { "id": 18108, - "msg_type": 0, + "msg_type": 2, "show_type": 0, "count_type": 0, "opencond_id": "kungfu", @@ -622,7 +622,17 @@ "count_type": 0, "opencond_id": "kungfu", "opencond": [], - "path": "Root|KungFu|IllustratedBubble|Page3", + "path": "Root|KungFu|IllustratedBubble|Reward", + "header": "" + }, + { + "id": 18112, + "msg_type": 2, + "show_type": 0, + "count_type": 0, + "opencond_id": "kungfu", + "opencond": [], + "path": "Root|KungFu|Dispatch|ProgressReward", "header": "" }, { @@ -894,5 +904,55 @@ "opencond": [], "path": "Root|System", "header": "" + }, + { + "id": 31100, + "msg_type": 0, + "show_type": 0, + "count_type": 0, + "opencond_id": "", + "opencond": [], + "path": "Root|Shopping", + "header": "" + }, + { + "id": 31101, + "msg_type": 2, + "show_type": 0, + "count_type": 0, + "opencond_id": "", + "opencond": [], + "path": "Root|Shopping|GiftPack", + "header": "" + }, + { + "id": 31102, + "msg_type": 1, + "show_type": 0, + "count_type": 1, + "opencond_id": "", + "opencond": [], + "path": "Root|Shopping|MonthlyCard", + "header": "" + }, + { + "id": 31103, + "msg_type": 0, + "show_type": 0, + "count_type": 0, + "opencond_id": "", + "opencond": [], + "path": "Root|MoonDream", + "header": "" + }, + { + "id": 31104, + "msg_type": 2, + "show_type": 0, + "count_type": 0, + "opencond_id": "", + "opencond": [], + "path": "Root|MoonDream|Reward", + "header": "" } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.ExclusiveRankData.go b/sys/configure/structs/Game.ExclusiveRankData.go index d25121ee2..66210fe79 100644 --- a/sys/configure/structs/Game.ExclusiveRankData.go +++ b/sys/configure/structs/Game.ExclusiveRankData.go @@ -12,7 +12,7 @@ import "errors" type GameExclusiveRankData struct { Id int32 - Weaponid int32 + Weaponid string Rank int32 Lvmax int32 Cost []*Gameatn @@ -26,7 +26,7 @@ func (*GameExclusiveRankData) GetTypeId() int32 { func (_v *GameExclusiveRankData)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["weaponid"].(float64); !_ok_ { err = errors.New("weaponid error"); return }; _v.Weaponid = int32(_tempNum_) } + { var _ok_ bool; if _v.Weaponid, _ok_ = _buf["weaponid"].(string); !_ok_ { err = errors.New("weaponid error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank"].(float64); !_ok_ { err = errors.New("rank error"); return }; _v.Rank = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvmax"].(float64); !_ok_ { err = errors.New("lvmax error"); return }; _v.Lvmax = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.ExclusiveStarData.go b/sys/configure/structs/Game.ExclusiveStarData.go index 02c242b83..3ae7687e7 100644 --- a/sys/configure/structs/Game.ExclusiveStarData.go +++ b/sys/configure/structs/Game.ExclusiveStarData.go @@ -12,7 +12,7 @@ import "errors" type GameExclusiveStarData struct { Id int32 - Weaponid int32 + Weaponid string Star int32 Commonskill int32 Exclusiveskill int32 @@ -27,7 +27,7 @@ func (*GameExclusiveStarData) GetTypeId() int32 { func (_v *GameExclusiveStarData)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["weaponid"].(float64); !_ok_ { err = errors.New("weaponid error"); return }; _v.Weaponid = int32(_tempNum_) } + { var _ok_ bool; if _v.Weaponid, _ok_ = _buf["weaponid"].(string); !_ok_ { err = errors.New("weaponid error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["commonskill"].(float64); !_ok_ { err = errors.New("commonskill error"); return }; _v.Commonskill = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exclusiveskill"].(float64); !_ok_ { err = errors.New("exclusiveskill error"); return }; _v.Exclusiveskill = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.ExclusiveUpgradeData.go b/sys/configure/structs/Game.ExclusiveUpgradeData.go index ce32ac734..400c1b8a0 100644 --- a/sys/configure/structs/Game.ExclusiveUpgradeData.go +++ b/sys/configure/structs/Game.ExclusiveUpgradeData.go @@ -12,7 +12,7 @@ import "errors" type GameExclusiveUpgradeData struct { Id int32 - Weaponid int32 + Weaponid string Lv int32 Attribute []*Gameatr Needexp int32 @@ -28,7 +28,7 @@ func (*GameExclusiveUpgradeData) GetTypeId() int32 { func (_v *GameExclusiveUpgradeData)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["weaponid"].(float64); !_ok_ { err = errors.New("weaponid error"); return }; _v.Weaponid = int32(_tempNum_) } + { var _ok_ bool; if _v.Weaponid, _ok_ = _buf["weaponid"].(string); !_ok_ { err = errors.New("weaponid 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_) } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.ExclusiveWeapon.go b/sys/configure/structs/Game.ExclusiveWeapon.go index 32605c547..a1342175d 100644 --- a/sys/configure/structs/Game.ExclusiveWeapon.go +++ b/sys/configure/structs/Game.ExclusiveWeapon.go @@ -9,13 +9,13 @@ package cfg type GameExclusiveWeapon struct { - _dataMap map[int32]*GameExclusiveWeaponData + _dataMap map[string]*GameExclusiveWeaponData _dataList []*GameExclusiveWeaponData } func NewGameExclusiveWeapon(_buf []map[string]interface{}) (*GameExclusiveWeapon, error) { _dataList := make([]*GameExclusiveWeaponData, 0, len(_buf)) - dataMap := make(map[int32]*GameExclusiveWeaponData) + dataMap := make(map[string]*GameExclusiveWeaponData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameExclusiveWeaponData(_ele_); err2 != nil { return nil, err2 @@ -27,7 +27,7 @@ func NewGameExclusiveWeapon(_buf []map[string]interface{}) (*GameExclusiveWeapon return &GameExclusiveWeapon{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameExclusiveWeapon) GetDataMap() map[int32]*GameExclusiveWeaponData { +func (table *GameExclusiveWeapon) GetDataMap() map[string]*GameExclusiveWeaponData { return table._dataMap } @@ -35,7 +35,7 @@ func (table *GameExclusiveWeapon) GetDataList() []*GameExclusiveWeaponData { return table._dataList } -func (table *GameExclusiveWeapon) Get(key int32) *GameExclusiveWeaponData { +func (table *GameExclusiveWeapon) Get(key string) *GameExclusiveWeaponData { return table._dataMap[key] } diff --git a/sys/configure/structs/Game.ExclusiveWeaponData.go b/sys/configure/structs/Game.ExclusiveWeaponData.go index 200bbbf24..1ea850044 100644 --- a/sys/configure/structs/Game.ExclusiveWeaponData.go +++ b/sys/configure/structs/Game.ExclusiveWeaponData.go @@ -11,7 +11,7 @@ package cfg import "errors" type GameExclusiveWeaponData struct { - Weaponid int32 + Weaponid string Heroid int32 Name string Color int32 @@ -28,7 +28,7 @@ func (*GameExclusiveWeaponData) GetTypeId() int32 { } func (_v *GameExclusiveWeaponData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weaponid"].(float64); !_ok_ { err = errors.New("weaponid error"); return }; _v.Weaponid = int32(_tempNum_) } + { var _ok_ bool; if _v.Weaponid, _ok_ = _buf["weaponid"].(string); !_ok_ { err = errors.New("weaponid error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroid"].(float64); !_ok_ { err = errors.New("heroid error"); return }; _v.Heroid = 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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } diff --git a/sys/configure/structs/TEnum.ERedMsgType.go b/sys/configure/structs/TEnum.ERedMsgType.go index 5d74c46e8..91ac85a4e 100644 --- a/sys/configure/structs/TEnum.ERedMsgType.go +++ b/sys/configure/structs/TEnum.ERedMsgType.go @@ -10,6 +10,6 @@ package cfg const ( TEnumERedMsgType_None = 0 - TEnumERedMsgType_Server = 1 - TEnumERedMsgType_Client = 2 + TEnumERedMsgType_Client = 1 + TEnumERedMsgType_Server = 2 )