This commit is contained in:
meixiongfeng 2023-11-23 10:03:35 +08:00
parent c7d3354b1f
commit c2cf522966
20 changed files with 2925 additions and 5987 deletions

View File

@ -5,7 +5,7 @@
"talkPoint": 0, "talkPoint": 0,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_1", "key": "drawcard_asked_storyText_1",
"text": "(乌龟大师):我在预兆中见过你的身影。" "text": "我在预兆中见过你的身影。"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",
@ -22,7 +22,7 @@
"talkPoint": 0, "talkPoint": 0,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_2", "key": "drawcard_asked_storyText_2",
"text": "(乌龟大师):孩子,你是追逐命运至此的勇士,还是身沐月光的传承之人?" "text": "孩子,你是追逐命运至此的勇士,还是身沐月光的传承之人?"
}, },
"optionText1": { "optionText1": {
"key": "drawcard_asked_optionText1_2", "key": "drawcard_asked_optionText1_2",
@ -39,7 +39,7 @@
"talkPoint": 1, "talkPoint": 1,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_3", "key": "drawcard_asked_storyText_3",
"text": "(乌龟大师):他决意召你前来" "text": "他决意召你前来"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",
@ -56,7 +56,7 @@
"talkPoint": 2, "talkPoint": 2,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_4", "key": "drawcard_asked_storyText_4",
"text": "(乌龟大师):却无法束缚你的言行。" "text": "却无法束缚你的言行。"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",
@ -73,7 +73,7 @@
"talkPoint": 0, "talkPoint": 0,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_5", "key": "drawcard_asked_storyText_5",
"text": "(乌龟大师):你如今身在阴影下,还是藏在月光中?" "text": "你如今身在阴影下,还是藏在月光中?"
}, },
"optionText1": { "optionText1": {
"key": "drawcard_asked_optionText1_5", "key": "drawcard_asked_optionText1_5",
@ -90,7 +90,7 @@
"talkPoint": 1, "talkPoint": 1,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_6", "key": "drawcard_asked_storyText_6",
"text": "(乌龟大师):黑暗终将吞没一切" "text": "黑暗终将吞没一切"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",
@ -107,7 +107,7 @@
"talkPoint": 2, "talkPoint": 2,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_7", "key": "drawcard_asked_storyText_7",
"text": "(乌龟大师):只留一线生机……" "text": "只留一线生机……"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",
@ -124,7 +124,7 @@
"talkPoint": 0, "talkPoint": 0,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_8", "key": "drawcard_asked_storyText_8",
"text": "(乌龟大师):你来见证终局,还是来博取这一线生机?" "text": "你来见证终局,还是来博取这一线生机?"
}, },
"optionText1": { "optionText1": {
"key": "drawcard_asked_optionText1_8", "key": "drawcard_asked_optionText1_8",
@ -141,7 +141,7 @@
"talkPoint": 0, "talkPoint": 0,
"storyText": { "storyText": {
"key": "drawcard_asked_storyText_9", "key": "drawcard_asked_storyText_9",
"text": "(乌龟大师):有趣!" "text": "有趣!"
}, },
"optionText1": { "optionText1": {
"key": "", "key": "",

View File

@ -1848,6 +1848,41 @@
"CanFriendHelp": 1, "CanFriendHelp": 1,
"Numrounds": 0 "Numrounds": 0
}, },
{
"id": 10103005,
"PlayType": 1,
"HeroCount": 1,
"readyScene": "scenesfight_role_interface_07",
"battleScenes": [
"scenesfight_09"
],
"BGMusic": "",
"LoadingId": 0,
"HideAlienSpace": 0,
"HideFightUI": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 720023,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [],
"RedAssistTeam": 0,
"BlueAssistTeam": 0,
"CanFriendHelp": 1,
"Numrounds": 0
},
{ {
"id": 10105001, "id": 10105001,
"PlayType": 1, "PlayType": 1,

File diff suppressed because it is too large Load Diff

View File

@ -806,7 +806,7 @@
"key": "GM_GM_text_128", "key": "GM_GM_text_128",
"text": "创角" "text": "创角"
}, },
"data": "输入昵称", "data": "昵称",
"prefix": "bingo:create,{0}" "prefix": "bingo:create,{0}"
} }
] ]

View File

@ -11884,7 +11884,7 @@
"ip": 1, "ip": 1,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": -1,
"prefab": "54017", "prefab": "54018",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -11892,8 +11892,8 @@
1, 1,
1 1
], ],
"icon": "54017", "icon": "54018",
"vocal": "54017", "vocal": "54018",
"tujing": [ "tujing": [
107 107
], ],
@ -11967,7 +11967,7 @@
"ip": 1, "ip": 1,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": -1,
"prefab": "54017", "prefab": "54019",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -11975,8 +11975,8 @@
1, 1,
1 1
], ],
"icon": "54017", "icon": "54019",
"vocal": "54017", "vocal": "54019",
"tujing": [ "tujing": [
107 107
], ],
@ -12050,7 +12050,7 @@
"ip": 1, "ip": 1,
"sd": 1, "sd": 1,
"handbook": -1, "handbook": -1,
"prefab": "54017", "prefab": "54020",
"rotation": "0|0|0", "rotation": "0|0|0",
"revolve": 0, "revolve": 0,
"scale": [ "scale": [
@ -12058,8 +12058,8 @@
1, 1,
1 1
], ],
"icon": "54017", "icon": "54020",
"vocal": "54017", "vocal": "54020",
"tujing": [ "tujing": [
107 107
], ],
@ -12119,6 +12119,255 @@
"text": "传说中的守护者“村民猪”,拥有不俗的战斗能力" "text": "传说中的守护者“村民猪”,拥有不俗的战斗能力"
} }
}, },
{
"hid": "54021",
"name": {
"key": "hero_main_name_54021",
"text": "葛伦科"
},
"star": 5,
"color": 4,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "54021",
"rotation": "0|0|0",
"revolve": 0,
"scale": [
1,
1,
1
],
"icon": "54021",
"vocal": "54021",
"tujing": [
107
],
"detailwindow": "effect_chezhan_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54005",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
"skill3": 0,
"txt": {
"key": "atlas_54021",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000013",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_145",
"text": "传说中的守护者“葛伦科”,拥有不俗的战斗能力"
}
},
{
"hid": "54022",
"name": {
"key": "hero_main_name_54022",
"text": "阴影战士"
},
"star": 5,
"color": 4,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "54022",
"rotation": "0|0|0",
"revolve": 0,
"scale": [
1,
1,
1
],
"icon": "54022",
"vocal": "54022",
"tujing": [
107
],
"detailwindow": "effect_chezhan_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54005",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
"skill3": 0,
"txt": {
"key": "atlas_54022",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000013",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_145",
"text": "传说中的守护者“阴影战士”,拥有不俗的战斗能力"
}
},
{
"hid": "54023",
"name": {
"key": "hero_main_name_54023",
"text": "龙群"
},
"star": 5,
"color": 4,
"race": 4,
"job": 1,
"type": 2,
"ip": 1,
"sd": 1,
"handbook": -1,
"prefab": "54023",
"rotation": "0|0|0",
"revolve": 0,
"scale": [
1,
1,
1
],
"icon": "54023",
"vocal": "54023",
"tujing": [
107
],
"detailwindow": "effect_chezhan_daiji",
"intr": {
"key": "",
"text": ""
},
"events": "hero_54005",
"cite": "",
"effectstay": [],
"hpspace": {
"x": 0,
"y": -0.69,
"z": 0
},
"capskillrule": 101,
"skill": 0,
"skill1": 0,
"skill2": 0,
"skill3": 0,
"txt": {
"key": "atlas_54023",
"text": ""
},
"enteranivalue": 0,
"camerainterval": 0,
"equiprcom": [
1,
2,
10
],
"angle": 0,
"deviation": 0,
"show": 2,
"herofrag": [
{
"a": "item",
"t": "12025001",
"n": 1
}
],
"herofragnum": 6,
"heroskillup": [
"10000004"
],
"expitem": [
{
"a": "item",
"t": "10000013",
"n": 1
}
],
"expitemnum": 7,
"herointr": {
"key": "hero_main_herointr_145",
"text": "传说中的守护者“龙群”,拥有不俗的战斗能力"
}
},
{ {
"hid": "51050", "hid": "51050",
"name": { "name": {

View File

@ -4,7 +4,7 @@
"id": 11001, "id": 11001,
"title": { "title": {
"key": "mainchapter_main_achievement_title_1", "key": "mainchapter_main_achievement_title_1",
"text": "遗香残留" "text": "迷人的反派"
}, },
"taskid": 11001001, "taskid": 11001001,
"reword": [ "reword": [
@ -16,7 +16,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000008" "icon": "item_10000008"
@ -26,7 +26,7 @@
"id": 11001, "id": 11001,
"title": { "title": {
"key": "mainchapter_main_achievement_title_2", "key": "mainchapter_main_achievement_title_2",
"text": "正与邪" "text": "暗影潜袭"
}, },
"taskid": 11001002, "taskid": 11001002,
"reword": [ "reword": [
@ -38,7 +38,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000008" "icon": "item_10000008"
@ -60,7 +60,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000009" "icon": "item_10000009"
@ -82,7 +82,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000009" "icon": "item_10000009"
@ -104,7 +104,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000009" "icon": "item_10000009"
@ -126,7 +126,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000009" "icon": "item_10000009"
@ -148,7 +148,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000001" "icon": "item_10000001"
@ -170,7 +170,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000001" "icon": "item_10000001"
@ -192,7 +192,7 @@
{ {
"a": "item", "a": "item",
"t": "24011001", "t": "24011001",
"n": 50 "n": 100
} }
], ],
"icon": "item_10000001" "icon": "item_10000001"

File diff suppressed because it is too large Load Diff

View File

@ -166,16 +166,18 @@
"pos": 4, "pos": 4,
"venturetext": { "venturetext": {
"key": "mainchapter_main_venture_venturetext_17", "key": "mainchapter_main_venture_venturetext_17",
"text": "待定关卡" "text": "兔子与猎犬"
}, },
"jumpidList": [] "jumpidList": [
10064
]
}, },
{ {
"chapterid": 11003, "chapterid": 11003,
"pos": 5, "pos": 5,
"venturetext": { "venturetext": {
"key": "mainchapter_main_venture_venturetext_18", "key": "mainchapter_main_venture_venturetext_18",
"text": "待定关卡" "text": "塔防"
}, },
"jumpidList": [] "jumpidList": []
}, },

View File

@ -239603,6 +239603,126 @@
"speed": 140, "speed": 140,
"modelsize": 1 "modelsize": 1
}, },
{
"Id": 720022,
"pos": 1,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{
"Id": 720022,
"pos": 2,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{
"Id": 720022,
"pos": 3,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{
"Id": 720022,
"pos": 4,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{
"Id": 720022,
"pos": 5,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 51050,
"star": 3,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{
"Id": 720023,
"pos": 1,
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 53001,
"star": 4,
"equip": [],
"newskill": [],
"lv": 5,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 140,
"modelsize": 1
},
{ {
"Id": 800001, "Id": 800001,
"pos": 1, "pos": 1,

View File

@ -3043,5 +3043,33 @@
"key": "opencond_opencond_kqbx_text_1", "key": "opencond_opencond_kqbx_text_1",
"text": "守护者养成,战力提升" "text": "守护者养成,战力提升"
} }
},
{
"id": "Traindragon",
"name": {
"key": "opencond_opencond_name_110",
"text": "驯龙养成"
},
"main": [
{
"key": 2,
"param": 1101004
}
],
"wkqbx": 0,
"img": "",
"prompt": {
"key": "",
"text": ""
},
"uiid": 0,
"activateType": 0,
"notify": [],
"kqbx": 0,
"kqbx_ui": "",
"kqbx_text": {
"key": "",
"text": ""
}
} }
] ]

File diff suppressed because it is too large Load Diff

View File

@ -7033,6 +7033,88 @@
], ],
"goto": 0 "goto": 0
}, },
{
"id": 320100,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"支线-希卡普旁的亚丝翠",
"901"
],
"event": [
2,
10010
],
"goto": 0
},
{
"id": 320108,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"901"
],
"event": [],
"goto": 0
},
{
"id": 320109,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"支线-希卡普旁的亚丝翠",
"901"
],
"event": [
2,
10010
],
"goto": 0
},
{
"id": 3001061,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"支线-亚丝翠旁的鼻涕粗2",
"901"
],
"event": [
2,
10010
],
"goto": 0
},
{
"id": 3001068,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"901"
],
"event": [],
"goto": 0
},
{
"id": 3001069,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"支线-亚丝翠旁的鼻涕粗2",
"901"
],
"event": [
2,
10010
],
"goto": 0
},
{ {
"id": 320110, "id": 320110,
"heroid": 25001, "heroid": 25001,

56
bin/json/game_tdbuff.json Normal file
View File

@ -0,0 +1,56 @@
[
{
"id": 2007,
"buff_type": 2005,
"describe": {
"key": "td_t_skill_describe_name2007",
"text": "超载:每次攻击获得一层超载。 每层攻击速度-25% 超载伤害+30% 达到三层持续10秒之后重置。弓箭超载特殊效果超载达到3层的弓箭能无视铁甲"
},
"effectType": [
22,
2
],
"value": [
-250,
300
],
"max_layer": 1,
"layer_effectType": [],
"layer_value": [],
"duration": 0,
"duration_layer": 10000,
"interval": 0
},
{
"id": 2008,
"buff_type": 2006,
"describe": {
"key": "td_t_skill_describe_name2008",
"text": "流血有25%概率给敌方追加一层流血 每秒60%伤害 最多四层。流血特殊效果每层流血会降低敌方治疗效果10%"
},
"effectType": [],
"value": [],
"max_layer": 0,
"layer_effectType": [],
"layer_value": [],
"duration": 0,
"duration_layer": 0,
"interval": 0
},
{
"id": 2009,
"buff_type": 2007,
"describe": {
"key": "td_t_skill_describe_name2009",
"text": "狂暴每次攻击50概率获得1层狂暴 每层伤害加5% 攻速加5% 爆炸范围+3% 最多10层 持续10秒 之后重置"
},
"effectType": [],
"value": [],
"max_layer": 0,
"layer_effectType": [],
"layer_value": [],
"duration": 0,
"duration_layer": 0,
"interval": 0
}
]

File diff suppressed because it is too large Load Diff

View File

@ -801,7 +801,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
log.Field{Key: "0", Value: datas[0]}, log.Field{Key: "0", Value: datas[0]},
) )
} else if len(datas) == 1 && (datas[0] == "create") { } else if len(datas) == 2 && (datas[0] == "create") {
var ( var (
err error err error
) )
@ -811,8 +811,9 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
return return
} }
req := &pb.UserCreateReq{ req := &pb.UserCreateReq{
Figure: 16010101, NickName: datas[1],
Gender: 1, Figure: 16010101,
Gender: 1,
} }
if errdata = module1.(comm.IUser).GMCreatePlayer(session, req); errdata != nil { if errdata = module1.(comm.IUser).GMCreatePlayer(session, req); errdata != nil {
return return

View File

@ -14,4 +14,5 @@ const (
GameOpencondType_Maxmapid = 2 GameOpencondType_Maxmapid = 2
GameOpencondType_Worldtaskid = 3 GameOpencondType_Worldtaskid = 3
GameOpencondType_Friend = 4 GameOpencondType_Friend = 4
GameOpencondType_MoonLevel = 5
) )

View File

@ -15,7 +15,7 @@ type GamePassCheckData struct {
PasscheckType int32 PasscheckType int32
Parameter int32 Parameter int32
UnlockText string UnlockText string
FreeReward []*Gameatn FreeReward *Gameatn
PayReward []*Gameatn PayReward []*Gameatn
} }
@ -30,20 +30,7 @@ func (_v *GamePassCheckData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passcheck_type"].(float64); !_ok_ { err = errors.New("passcheck_type error"); return }; _v.PasscheckType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passcheck_type"].(float64); !_ok_ { err = errors.New("passcheck_type error"); return }; _v.PasscheckType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockText, _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["unlock_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["free_reward"].(map[string]interface{}); !_ok_ { err = errors.New("free_reward error"); return }; if _v.FreeReward, err = DeserializeGameatn(_x_); err != nil { return } }
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["free_reward"].([]interface{}); !_ok_ { err = errors.New("free_reward error"); return }
_v.FreeReward = 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.FreeReward = append(_v.FreeReward, _list_v_)
}
}
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool

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 GameTDBuff struct {
_dataMap map[int32]*GameTDBuffData
_dataList []*GameTDBuffData
}
func NewGameTDBuff(_buf []map[string]interface{}) (*GameTDBuff, error) {
_dataList := make([]*GameTDBuffData, 0, len(_buf))
dataMap := make(map[int32]*GameTDBuffData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameTDBuffData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameTDBuff{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameTDBuff) GetDataMap() map[int32]*GameTDBuffData {
return table._dataMap
}
func (table *GameTDBuff) GetDataList() []*GameTDBuffData {
return table._dataList
}
func (table *GameTDBuff) Get(key int32) *GameTDBuffData {
return table._dataMap[key]
}

View File

@ -0,0 +1,107 @@
//------------------------------------------------------------------------------
// <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 GameTDBuffData struct {
Id int32
BuffType int32
Describe string
EffectType []int32
Value []int32
MaxLayer int32
LayerEffectType []int32
LayerValue []int32
Duration int32
DurationLayer int32
Interval int32
}
const TypeId_GameTDBuffData = 204820617
func (*GameTDBuffData) GetTypeId() int32 {
return 204820617
}
func (_v *GameTDBuffData)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["buff_type"].(float64); !_ok_ { err = errors.New("buff_type error"); return }; _v.BuffType = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["effectType"].([]interface{}); !_ok_ { err = errors.New("effectType error"); return }
_v.EffectType = 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.EffectType = append(_v.EffectType, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["value"].([]interface{}); !_ok_ { err = errors.New("value error"); return }
_v.Value = 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.Value = append(_v.Value, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_layer"].(float64); !_ok_ { err = errors.New("max_layer error"); return }; _v.MaxLayer = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["layer_effectType"].([]interface{}); !_ok_ { err = errors.New("layer_effectType error"); return }
_v.LayerEffectType = 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.LayerEffectType = append(_v.LayerEffectType, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["layer_value"].([]interface{}); !_ok_ { err = errors.New("layer_value error"); return }
_v.LayerValue = 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.LayerValue = append(_v.LayerValue, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration"].(float64); !_ok_ { err = errors.New("duration error"); return }; _v.Duration = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duration_layer"].(float64); !_ok_ { err = errors.New("duration_layer error"); return }; _v.DurationLayer = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["interval"].(float64); !_ok_ { err = errors.New("interval error"); return }; _v.Interval = int32(_tempNum_) }
return
}
func DeserializeGameTDBuffData(_buf map[string]interface{}) (*GameTDBuffData, error) {
v := &GameTDBuffData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -288,6 +288,7 @@ type Tables struct {
TDWeapon *GameTDWeapon TDWeapon *GameTDWeapon
TDWeaponSkill *GameTDWeaponSkill TDWeaponSkill *GameTDWeaponSkill
TDWeaponRandom *GameTDWeaponRandom TDWeaponRandom *GameTDWeaponRandom
TDBuff *GameTDBuff
PuggsyIsLand *GamePuggsyIsLand PuggsyIsLand *GamePuggsyIsLand
PuggsyEvent *GamePuggsyEvent PuggsyEvent *GamePuggsyEvent
PuggsyFight *GamePuggsyFight PuggsyFight *GamePuggsyFight
@ -1979,6 +1980,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.TDWeaponRandom, err = NewGameTDWeaponRandom(buf) ; err != nil { if tables.TDWeaponRandom, err = NewGameTDWeaponRandom(buf) ; err != nil {
return nil, err return nil, err
} }
if buf, err = loader("game_tdbuff") ; err != nil {
return nil, err
}
if tables.TDBuff, err = NewGameTDBuff(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_puggsyisland") ; err != nil { if buf, err = loader("game_puggsyisland") ; err != nil {
return nil, err return nil, err
} }