配置同步

This commit is contained in:
meixiongfeng 2023-05-17 14:17:28 +08:00
parent 1da5837986
commit 7246ba738a
12 changed files with 302 additions and 128 deletions

View File

@ -12,7 +12,7 @@
},
"skilltxt": {
"key": "Life increased by 1.6%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 16,
@ -48,7 +48,7 @@
},
"skilltxt": {
"key": "Attack increased by 1.0%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -79,7 +79,7 @@
},
"skilltxt": {
"key": "Defence increased by 1.0%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -106,11 +106,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 10,
@ -137,11 +137,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 10,
@ -168,11 +168,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 18,
@ -199,11 +199,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 18,
@ -230,11 +230,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 18,
@ -266,11 +266,11 @@
],
"skillname": {
"key": "hppower",
"text": "生命天赋"
"text": "生命星象"
},
"skilltxt": {
"key": "Life increased by 1.8%",
"text": "这是生命天赋的描述tips"
"text": "这是生命星象的描述tips"
},
"skillicon": "js_jx_img_icon03",
"hp": 18,
@ -297,11 +297,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -328,11 +328,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -359,11 +359,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -390,11 +390,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -421,11 +421,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -452,11 +452,11 @@
],
"skillname": {
"key": "atkpower",
"text": "攻击天赋"
"text": "攻击星象"
},
"skilltxt": {
"key": "Attack increased by 1.5%",
"text": "这是攻击天赋的描述tips"
"text": "这是攻击星象的描述tips"
},
"skillicon": "js_jx_img_icon01",
"hp": -1,
@ -488,11 +488,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -519,11 +519,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -550,11 +550,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -581,11 +581,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -612,11 +612,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -643,11 +643,11 @@
],
"skillname": {
"key": "defpower",
"text": "防御天赋"
"text": "防御星象"
},
"skilltxt": {
"key": "Defence increased by 1.5%",
"text": "这是防御天赋的描述tips"
"text": "这是防御星象的描述tips"
},
"skillicon": "js_jx_img_icon02",
"hp": -1,
@ -674,11 +674,11 @@
],
"skillname": {
"key": "Attackspeed",
"text": "攻速天赋"
"text": "攻速星象"
},
"skilltxt": {
"key": "Attack speed increased by 3%",
"text": "这是攻速天赋的描述tips"
"text": "这是攻速星象的描述tips"
},
"skillicon": "js_jx_img_icon04",
"hp": -1,
@ -705,11 +705,11 @@
],
"skillname": {
"key": "Attackspeed",
"text": "攻速天赋"
"text": "攻速星象"
},
"skilltxt": {
"key": "Attack speed increased by 4%",
"text": "这是攻速天赋的描述tips"
"text": "这是攻速星象的描述tips"
},
"skillicon": "js_jx_img_icon04",
"hp": -1,
@ -736,11 +736,11 @@
],
"skillname": {
"key": "Criticalstrike",
"text": "暴击天赋"
"text": "暴击星象"
},
"skilltxt": {
"key": "Critical hit increased by 10%",
"text": "这是暴击天赋的描述tips"
"text": "这是暴击星象的描述tips"
},
"skillicon": "js_jx_img_icon05",
"hp": -1,

View File

@ -1868,5 +1868,35 @@
"n": 1
}
]
},
{
"index": "353",
"var": [
{
"a": "per",
"t": "16010101",
"n": 1
}
]
},
{
"index": "354",
"var": [
{
"a": "per",
"t": "16010201",
"n": 1
}
]
},
{
"index": "355",
"var": [
{
"a": "per",
"t": "16010301",
"n": 1
}
]
}
]

View File

@ -1,34 +1,37 @@
[
{
"id": 1001,
"id": "16010101",
"type": 1,
"icon": "wp_icon_10019",
"tujing": [
107
],
"url": "",
"murl": "100001",
"wurl": "100001",
"playerhead": "wp_icon_10019",
"name": "普通头像"
},
{
"id": 2001,
"id": "16010201",
"type": 2,
"icon": "wp_icon_10019",
"tujing": [
107
],
"url": "",
"murl": "explore",
"wurl": "explore",
"playerhead": "wp_icon_10019",
"name": "普通动作"
},
{
"id": 3001,
"id": "16010301",
"type": 3,
"icon": "wp_icon_10019",
"tujing": [
107
],
"url": "",
"murl": "character_cardshow",
"wurl": "character_cardshow",
"playerhead": "wp_icon_10019",
"name": "普通背景"
}

View File

@ -0,0 +1,38 @@
[
{
"id": "16010101",
"type": 1,
"icon": "wp_icon_10019",
"tujing": [
107
],
"murl": "100001",
"wurl": "100001",
"playerhead": "wp_icon_10019",
"name": "普通头像"
},
{
"id": "16010201",
"type": 2,
"icon": "wp_icon_10019",
"tujing": [
107
],
"murl": "explore",
"wurl": "explore",
"playerhead": "wp_icon_10019",
"name": "普通动作"
},
{
"id": "16010301",
"type": 3,
"icon": "wp_icon_10019",
"tujing": [
107
],
"murl": "character_cardshow",
"wurl": "character_cardshow",
"playerhead": "wp_icon_10019",
"name": "普通背景"
}
]

View File

@ -600,5 +600,19 @@
100020
],
"goto": 0
},
{
"id": 90010,
"heroid": 25001,
"datas": [
"CaravanScene",
"商队事件测试组件",
"141"
],
"event": [
2,
9060
],
"goto": 0
}
]

View File

@ -11,30 +11,6 @@
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
},
{
"id": 100002,
"desc": {
"key": "show_100002",
"text": "男形象2"
},
"access": 0,
"position": "",
"sex": 1,
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
},
{
"id": 100003,
"desc": {
"key": "show_100003",
"text": "男形象3"
},
"access": 0,
"position": "",
"sex": 1,
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
},
{
"id": 200001,
"desc": {
@ -46,29 +22,5 @@
"sex": 2,
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
},
{
"id": 200002,
"desc": {
"key": "show_200002",
"text": "女形象2"
},
"access": 0,
"position": "",
"sex": 2,
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
},
{
"id": 200003,
"desc": {
"key": "show_200003",
"text": "女形象3"
},
"access": 0,
"position": "",
"sex": 2,
"resources": "Person/10000/10000M.prefab",
"vague": "Person/10000/10000M.prefab"
}
]

View File

@ -1108,5 +1108,43 @@
}
],
"module": []
},
{
"key": 600010,
"lock": 0,
"lockend": 0,
"ontxe": 0,
"id_after": 0,
"group": 610,
"des": 5,
"icon": "",
"task_Tname": {
"key": "worldtask_world_task_task_Tname_26",
"text": "商队测试"
},
"task_name": {
"key": "worldtask_world_task_task_name_26",
"text": "商队测试"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_26",
"text": "商队测试"
},
"npc": 90010,
"completetasktxt": {
"key": "worldtask_world_task_completetasktxt_26",
"text": "商队测试A"
},
"completetask": [
0
],
"deliver_npctxt": {
"key": "Mainline_Tasks1_101",
"text": "商队测试A"
},
"deliver_npc": 0,
"auto_accept": 0,
"reword": [],
"module": []
}
]

View File

@ -9,13 +9,13 @@
package cfg
type GamePlayerInfor_overview struct {
_dataMap map[int32]*GamePlayerInfor_overviewData
_dataMap map[string]*GamePlayerInfor_overviewData
_dataList []*GamePlayerInfor_overviewData
}
func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfor_overview, error) {
_dataList := make([]*GamePlayerInfor_overviewData, 0, len(_buf))
dataMap := make(map[int32]*GamePlayerInfor_overviewData)
dataMap := make(map[string]*GamePlayerInfor_overviewData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePlayerInfor_overviewData(_ele_); err2 != nil {
return nil, err2
@ -27,7 +27,7 @@ func NewGamePlayerInfor_overview(_buf []map[string]interface{}) (*GamePlayerInfo
return &GamePlayerInfor_overview{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePlayerInfor_overview) GetDataMap() map[int32]*GamePlayerInfor_overviewData {
func (table *GamePlayerInfor_overview) GetDataMap() map[string]*GamePlayerInfor_overviewData {
return table._dataMap
}
@ -35,7 +35,7 @@ func (table *GamePlayerInfor_overview) GetDataList() []*GamePlayerInfor_overview
return table._dataList
}
func (table *GamePlayerInfor_overview) Get(key int32) *GamePlayerInfor_overviewData {
func (table *GamePlayerInfor_overview) Get(key string) *GamePlayerInfor_overviewData {
return table._dataMap[key]
}

View File

@ -11,11 +11,12 @@ package cfg
import "errors"
type GamePlayerInfor_overviewData struct {
Id int32
Id string
Type int32
Icon string
Tujing []int32
Url string
Murl string
Wurl string
Playerhead string
Name string
}
@ -27,7 +28,7 @@ func (*GamePlayerInfor_overviewData) GetTypeId() int32 {
}
func (_v *GamePlayerInfor_overviewData)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; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{
@ -44,7 +45,8 @@ func (_v *GamePlayerInfor_overviewData)Deserialize(_buf map[string]interface{})
}
}
{ var _ok_ bool; if _v.Url, _ok_ = _buf["url"].(string); !_ok_ { err = errors.New("url error"); return } }
{ var _ok_ bool; if _v.Murl, _ok_ = _buf["murl"].(string); !_ok_ { err = errors.New("murl error"); return } }
{ var _ok_ bool; if _v.Wurl, _ok_ = _buf["wurl"].(string); !_ok_ { err = errors.New("wurl error"); return } }
{ var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
return

View File

@ -0,0 +1,42 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GamePlayerOverview struct {
_dataMap map[string]*GamePlayerOverviewData
_dataList []*GamePlayerOverviewData
}
func NewGamePlayerOverview(_buf []map[string]interface{}) (*GamePlayerOverview, error) {
_dataList := make([]*GamePlayerOverviewData, 0, len(_buf))
dataMap := make(map[string]*GamePlayerOverviewData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGamePlayerOverviewData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GamePlayerOverview{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GamePlayerOverview) GetDataMap() map[string]*GamePlayerOverviewData {
return table._dataMap
}
func (table *GamePlayerOverview) GetDataList() []*GamePlayerOverviewData {
return table._dataList
}
func (table *GamePlayerOverview) Get(key string) *GamePlayerOverviewData {
return table._dataMap[key]
}

View File

@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GamePlayerOverviewData struct {
Id string
Type int32
Icon string
Tujing []int32
Murl string
Wurl string
Playerhead string
Name string
}
const TypeId_GamePlayerOverviewData = -1442303552
func (*GamePlayerOverviewData) GetTypeId() int32 {
return -1442303552
}
func (_v *GamePlayerOverviewData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ { err = errors.New("tujing error"); return }
_v.Tujing = 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.Tujing = append(_v.Tujing, _list_v_)
}
}
{ var _ok_ bool; if _v.Murl, _ok_ = _buf["murl"].(string); !_ok_ { err = errors.New("murl error"); return } }
{ var _ok_ bool; if _v.Wurl, _ok_ = _buf["wurl"].(string); !_ok_ { err = errors.New("wurl error"); return } }
{ var _ok_ bool; if _v.Playerhead, _ok_ = _buf["playerhead"].(string); !_ok_ { err = errors.New("playerhead error"); return } }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
return
}
func DeserializeGamePlayerOverviewData(_buf map[string]interface{}) (*GamePlayerOverviewData, error) {
v := &GamePlayerOverviewData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -87,13 +87,11 @@ type Tables struct {
Herofusion *GameHerofusion
PlayerInfor *GamePlayerInfor
PlayerInfor_overview *GamePlayerInfor_overview
TalentSkill *GameTalentSkill
ArenaBuyChallenge *GameArenaBuyChallenge
ArenaActiveReward *GameArenaActiveReward
ArenaRobot *GameArenaRobot
ArenaRankReward *GameArenaRankReward
ArenaChallengeNpc *GameArenaChallengeNpc
ItemBox *GameItemBox
Show *GameShow
GuildLv *GameGuildLv
GuildPng *GameGuildPng
@ -181,6 +179,7 @@ type Tables struct {
itinerant_battle *Gameitinerant_battle
itinerant_event *Gameitinerant_event
NewRedDot *GameNewRedDot
Talent *GameTalent
Favorability *GameFavorability
Friends *GameFriends
CampLv *GameCampLv
@ -194,9 +193,9 @@ type Tables struct {
Pricegroup *GamePricegroup
Loading *GameLoading
RuleDesc *GameRuleDesc
PlayerOverview *GamePlayerOverview
HeroTalent *GameHeroTalent
TalentBox *GameTalentBox
Talent *GameTalent
}
func NewTables(loader JsonLoader) (*Tables, error) {
@ -660,12 +659,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PlayerInfor_overview, err = NewGamePlayerInfor_overview(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_talentskill") ; err != nil {
return nil, err
}
if tables.TalentSkill, err = NewGameTalentSkill(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_arenabuychallenge") ; err != nil {
return nil, err
}
@ -696,12 +689,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.ArenaChallengeNpc, err = NewGameArenaChallengeNpc(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_itembox") ; err != nil {
return nil, err
}
if tables.ItemBox, err = NewGameItemBox(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_show") ; err != nil {
return nil, err
}
@ -1224,6 +1211,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.NewRedDot, err = NewGameNewRedDot(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_talent") ; err != nil {
return nil, err
}
if tables.Talent, err = NewGameTalent(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_favorability") ; err != nil {
return nil, err
}
@ -1302,6 +1295,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.RuleDesc, err = NewGameRuleDesc(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_playeroverview") ; err != nil {
return nil, err
}
if tables.PlayerOverview, err = NewGamePlayerOverview(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_herotalent") ; err != nil {
return nil, err
}
@ -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_talent") ; err != nil {
return nil, err
}
if tables.Talent, err = NewGameTalent(buf) ; err != nil {
return nil, err
}
return tables, nil
}