liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-08-25 19:08:44 +08:00
commit a59443fffb
25 changed files with 18581 additions and 5942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bin/json/game_annulartask_library.json
View File

@ -1,10 +1,19 @@
[
{
"id": 1,
"assembleid": 60000010,
"lvstart": 10,
"lvend": 999,
"itemid": 1130,
"itemwt": 1000,
"min": 0
},
{
"id": 2,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
"itemid": 1130,
"lvend": 9,
"itemid": 1150,
"itemwt": 1000,
"min": 0
},
@ -18,7 +27,7 @@
"min": 0
},
{
"id": 6,
"id": 4,
"assembleid": 60000010,
"lvstart": 1,
"lvend": 999,
@ -27,7 +36,7 @@
"min": 0
},
{
"id": 7,
"id": 5,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
@ -36,7 +45,7 @@
"min": 0
},
{
"id": 9,
"id": 6,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
@ -45,7 +54,7 @@
"min": 0
},
{
"id": 12,
"id": 7,
"assembleid": 60000020,
"lvstart": 1,
"lvend": 999,
@ -54,7 +63,7 @@
"min": 0
},
{
"id": 15,
"id": 8,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
@ -63,7 +72,7 @@
"min": 0
},
{
"id": 16,
"id": 9,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
@ -72,7 +81,7 @@
"min": 0
},
{
"id": 18,
"id": 10,
"assembleid": 60000030,
"lvstart": 1,
"lvend": 999,
@ -81,7 +90,7 @@
"min": 0
},
{
"id": 21,
"id": 11,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
@ -90,7 +99,7 @@
"min": 0
},
{
"id": 23,
"id": 12,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
@ -99,7 +108,7 @@
"min": 0
},
{
"id": 24,
"id": 13,
"assembleid": 60000040,
"lvstart": 1,
"lvend": 999,
@ -108,7 +117,7 @@
"min": 0
},
{
"id": 27,
"id": 14,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,
@ -117,7 +126,7 @@
"min": 0
},
{
"id": 30,
"id": 15,
"assembleid": 60000050,
"lvstart": 1,
"lvend": 999,

64
bin/json/game_askall.json
View File

@ -46,69 +46,5 @@
}
],
"restime": 1
},
{
"key": 4,
"ExaminationGroup": 1004,
"examinationnum": 3,
"start": 12610,
"continue": 12610,
"time": 0,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
}
],
"restime": 1
},
{
"key": 5,
"ExaminationGroup": 1005,
"examinationnum": 3,
"start": 12610,
"continue": 12610,
"time": 0,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
}
],
"restime": 1
},
{
"key": 6,
"ExaminationGroup": 1006,
"examinationnum": 3,
"start": 12610,
"continue": 12610,
"time": 0,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
}
],
"restime": 1
},
{
"key": 7,
"ExaminationGroup": 1007,
"examinationnum": 3,
"start": 12610,
"continue": 12610,
"time": 0,
"reward": [
{
"a": "attr",
"t": "diamond",
"n": 50
}
],
"restime": 2
}
]

1023
bin/json/game_asklibrary.json
View File

File diff suppressed because it is too large Load Diff

48
bin/json/game_buriedcondi.json
View File

@ -24981,7 +24981,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_879",
"text": "完成一次考试1"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25003,7 +25003,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_880",
"text": "完成一次考试2"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25025,7 +25025,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_881",
"text": "完成一次考试3"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25047,7 +25047,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_882",
"text": "完成一次考试4"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25069,7 +25069,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_883",
"text": "完成一次考试5"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25091,7 +25091,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_884",
"text": "完成一次考试6"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25113,7 +25113,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_885",
"text": "完成一次考试7"
"text": "完成一次考试"
},
"type": 204,
"valid": 0,
@ -25255,7 +25255,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_891",
"text": "寻找所有宝箱1"
"text": "寻找所有宝箱"
},
"type": 205,
"valid": 0,
@ -25277,7 +25277,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_892",
"text": "寻找所有宝箱2"
"text": "寻找所有宝箱"
},
"type": 205,
"valid": 0,
@ -25299,7 +25299,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_893",
"text": "寻找所有宝箱3"
"text": "寻找所有宝箱"
},
"type": 205,
"valid": 0,
@ -25321,7 +25321,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_894",
"text": "寻找所有宝箱4"
"text": "寻找所有宝箱"
},
"type": 205,
"valid": 0,
@ -25343,7 +25343,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_895",
"text": "寻找所有宝箱5"
"text": "寻找所有宝箱"
},
"type": 205,
"valid": 0,
@ -26219,9 +26219,9 @@
"n": 1
},
"NPC": -103,
"value": 24002,
"value": 3,
"filter": [
18
24002
],
"filter2": []
},
@ -26243,9 +26243,9 @@
"n": 1
},
"NPC": -103,
"value": 24003,
"value": 3,
"filter": [
18
24003
],
"filter2": []
},
@ -26267,9 +26267,9 @@
"n": 1
},
"NPC": -103,
"value": 34003,
"value": 3,
"filter": [
18
34003
],
"filter2": []
},
@ -26291,9 +26291,9 @@
"n": 1
},
"NPC": -103,
"value": 14003,
"value": 3,
"filter": [
18
14003
],
"filter2": []
},
@ -26315,9 +26315,9 @@
"n": 1
},
"NPC": -103,
"value": 44006,
"value": 3,
"filter": [
18
44006
],
"filter2": []
},
@ -26339,9 +26339,9 @@
"n": 1
},
"NPC": -103,
"value": 14005,
"value": 3,
"filter": [
18
14005
],
"filter2": []
},

6
bin/json/game_celebration.json
View File

@ -12,7 +12,7 @@
"days": 2,
"tipstxt": {
"key": "celebration_celebration_tipstxt_1",
"text": "每日前{0}次挑战猎魂任意boss，可以获得双倍奖励"
"text": "每日前[color=#AAFF00]{0}[/color]次挑战猎魂任意boss，可以获得双倍奖励"
}
},
{
@ -28,7 +28,7 @@
"days": 2,
"tipstxt": {
"key": "celebration_celebration_tipstxt_2",
"text": "每日前{0}次挑战梦境回廊，可以获得双倍奖励"
"text": "每日前[color=#AAFF00]{0}[/color]次挑战梦境回廊，可以获得双倍奖励"
}
},
{
@ -48,7 +48,7 @@
"days": 2,
"tipstxt": {
"key": "celebration_celebration_tipstxt_3",
"text": "每日前{0}次挑战维京远征，可以获得双倍奖励，每名boss每日分别只能挑战{1}次"
"text": "每日前[color=#AAFF00]{0}[/color]次挑战维京远征，可以获得双倍奖励，每名boss每日分别只能挑战[color=#AAFF00]{0}[/color]次"
}
}
]

7348
bin/json/game_favorability.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_fightglobalevent.json
View File

@ -639,7 +639,7 @@
"text": ""
},
"When": 21,
"FromCheck": "",
"FromCheck": "Side=2",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
@ -702,7 +702,7 @@
"text": ""
},
"When": 21,
"FromCheck": "",
"FromCheck": "Side=2",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",

4
bin/json/game_guidance.json
View File

@ -122,7 +122,7 @@
},
{
"id": 12,
"exp": "狩猎",
"exp": "猎魂",
"jumpid": 168,
"index": 9,
"intr": {
@ -133,7 +133,7 @@
},
{
"id": 13,
"exp": "经验副本",
"exp": "梦境回廊",
"jumpid": 10013,
"index": 8,
"intr": {

3300
bin/json/game_heroawaken.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_mainstage.json
View File

@ -8933,7 +8933,7 @@
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
"venturemodel": "Person/yacht/yacht.prefab",
"bubbletalk": {
"key": "",
"text": ""
@ -9044,7 +9044,7 @@
"Episodetype": 1,
"openlevel": 1,
"EditorStage": 0,
"venturemodel": "",
"venturemodel": "Person/badcar/badcar.prefab",
"bubbletalk": {
"key": "",
"text": ""

112
bin/json/game_rdtasknpc.json
View File

@ -5723,7 +5723,7 @@
"datas": [
"WuGuanScene",
"武馆的老虎",
"901"
"137"
],
"event": [
2,
@ -6634,7 +6634,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"功能入口-狩猎",
"901"
],
"event": [
@ -6664,7 +6664,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"功能入口-狩猎",
"901"
],
"event": [
@ -6679,7 +6679,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-亚丝翠",
"901"
],
"event": [
@ -6709,7 +6709,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-亚丝翠",
"901"
],
"event": [
@ -6724,7 +6724,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-姜饼人",
"901"
],
"event": [
@ -6754,7 +6754,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-姜饼人",
"901"
],
"event": [
@ -6814,7 +6814,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-匹诺曹",
"901"
],
"event": [
@ -6844,7 +6844,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"跑环-烹饪-匹诺曹",
"901"
],
"event": [
@ -7350,7 +7350,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"功能入口-魔药",
"901"
],
"event": [
@ -7380,9 +7380,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
"SmithyScene",
"打造",
"139"
],
"event": [
2,
@ -7412,7 +7412,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"功能入口-烹饪",
"901"
],
"event": [
@ -7442,9 +7442,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
"CommandScene",
"功能入口_主线",
"905"
],
"event": [
2,
@ -7473,9 +7473,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
@ -7505,7 +7505,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-维京远征",
"功能入口-烹饪",
"901"
],
"event": [
@ -7520,7 +7520,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"氛围npc-警卫1号",
"901"
],
"event": [
@ -7542,9 +7542,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-竞技场",
"901"
"WuGuanScene",
"阿宝",
"137"
],
"event": [
2,
@ -7574,7 +7574,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-浇水拼图",
"氛围npc-金猴",
"901"
],
"event": [
@ -7589,7 +7589,7 @@
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"总教习",
"137"
],
"event": [
@ -7612,7 +7612,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-维京远征",
"功能入口-魔药",
"901"
],
"event": [
@ -7643,7 +7643,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-藏书馆",
"跑环-烹饪-姜饼人",
"901"
],
"event": [
@ -7681,7 +7681,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-浇水拼图",
"跑环-连环-狐狸女",
"901"
],
"event": [
@ -7695,9 +7695,9 @@
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"阿宝",
"137"
"GameMain",
"功能入口-烹饪",
"901"
],
"event": [
2,
@ -7709,11 +7709,7 @@
"id": 60388,
"heroid": 25001,
"Levelid": 0,
"datas": [
"WuGuanScene",
"总教习",
"137"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7721,11 +7717,7 @@
"id": 60390,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-商人",
"901"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7733,11 +7725,7 @@
"id": 60391,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-公告",
"901"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7745,11 +7733,7 @@
"id": 60398,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-邮件",
"901"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7759,7 +7743,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-藏书馆",
"功能入口-魔药",
"901"
],
"event": [
@ -7772,11 +7756,7 @@
"id": 60411,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-魔药",
"901"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7784,11 +7764,7 @@
"id": 60418,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-剧情副本(旧时光)",
"901"
],
"datas": [],
"event": [],
"goto": 0
},
@ -7813,7 +7789,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-招募",
"功能入口-魔药",
"901"
],
"event": [
@ -7826,11 +7802,7 @@
"id": 60428,
"heroid": 25001,
"Levelid": 0,
"datas": [
"GameMain",
"功能入口-烹饪",
"901"
],
"datas": [],
"event": [],
"goto": 0
}

4
bin/json/game_ruledesc.json
View File

@ -172,7 +172,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_16",
"text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一件穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。<br>点击装备可以打开装备强化界面，强化装备需要金币。每次强化到一定等级可以解锁装备副词条。<br>不同稀有度的装备等级上限不同，可解锁的副词条数量也不同。<br>强化装备有概率失败，装备强化等级越高，失败的概率也越高，失败到一定次数下次一定强化成功。"
"text": "这里可以查看你拥有的所有装备，并且可以给守护者们装备上，一键穿戴会默认选择你最好的装备穿戴给当前守护者（已穿戴装备除外）。<br>点击装备可以打开装备强化界面，强化装备需要金币。每次强化到一定等级可以解锁装备副词条。<br>不同稀有度的装备等级上限不同，可解锁的副词条数量也不同。<br>强化装备有概率失败，装备强化等级越高，失败的概率也越高，失败到一定次数下次一定强化成功。"
}
},
{
@ -502,7 +502,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_46",
"text": "这里可以使用主角月光与水晶的力量，迅速提升守护者的等级。<br>水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。<br>上阵守护者槽位由玩家等级解锁，每一个槽位只能上阵相应品质的守护者。<br>卸下守护者后槽位会进入不稳定状态，稳定槽位需要24小时或者200月光原石迅速稳定。"
"text": "这里可以使用传承者月光与水晶的力量，迅速提升守护者的等级。<br>水晶会挑选你等级最高的5位守护者为核心，在右侧上阵守护者将会把等级提升至五位最高的守护者中等级最低的那一位。<br>上阵守护者槽位由传承者等级解锁，每一个槽位只能上阵相应品质的守护者。<br>卸下守护者后槽位会进入不稳定状态，稳定槽位需要等待24小时或者200月光原石迅速稳定。"
}
}
]

96
bin/json/game_skillafteratk.json
View File

@ -6662,7 +6662,7 @@
"From": 1,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
@ -6682,7 +6682,7 @@
{
"Id": 215005212,
"EmitPR": 1000,
"From": 9,
"From": 12,
"Where": [],
"Order": "",
"Limit": 1,
@ -6774,7 +6774,7 @@
"EmitPR": 1000,
"From": 1,
"Where": [
"SelfHasBuff=1"
"EnemyHasBuff=1"
],
"Order": "",
"Limit": 10,
@ -10060,7 +10060,7 @@
{
"Id": 245003212,
"EmitPR": 1000,
"From": 1,
"From": 13,
"Where": [],
"Order": "",
"Limit": 10,
@ -21030,7 +21030,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001129,
390001122,
1000,
1,
2
@ -48857,7 +48857,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000000,
390001011,
1000,
1,
-1
@ -48918,7 +48918,7 @@
"RevisiParams": []
},
{
"Id": 824004111,
"Id": 813002111,
"EmitPR": 1000,
"From": 4,
"Where": [],
@ -48939,7 +48939,7 @@
"RevisiParams": []
},
{
"Id": 824004211,
"Id": 813002211,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -48948,7 +48948,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
482400421,
481300221,
-1,
-1
],
@ -48962,7 +48962,7 @@
"RevisiParams": []
},
{
"Id": 824004212,
"Id": 813002212,
"EmitPR": 1000,
"From": 12,
"Where": [],
@ -48986,7 +48986,7 @@
"RevisiParams": []
},
{
"Id": 824004213,
"Id": 813002213,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -48995,7 +48995,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
482400422,
481300222,
-1,
-1
],
@ -49009,7 +49009,7 @@
"RevisiParams": []
},
{
"Id": 824004214,
"Id": 813002214,
"EmitPR": 1000,
"From": 12,
"Where": [],
@ -49109,15 +49109,13 @@
"Id": 844006214,
"EmitPR": 1000,
"From": 3,
"Where": [
"EnemyNoBuff=3"
],
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001411,
391000065,
1000,
1,
1
@ -49585,7 +49583,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
391000008,
390001561,
1000,
1,
-1
@ -50052,15 +50050,13 @@
"Id": 845001214,
"EmitPR": 1000,
"From": 3,
"Where": [
"EnemyNoBuff=3"
],
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001115,
391000065,
1000,
1,
-1
@ -50408,9 +50404,9 @@
"Type": 3,
"Argu": [
391000008,
400,
1000,
1,
1
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -50422,7 +50418,7 @@
"RevisiParams": []
},
{
"Id": 813002211,
"Id": 824004211,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -50431,7 +50427,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
451305111,
482400421,
-1,
-1
],
@ -50445,7 +50441,7 @@
"RevisiParams": []
},
{
"Id": 813002212,
"Id": 824004212,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -50469,7 +50465,7 @@
"RevisiParams": []
},
{
"Id": 813002213,
"Id": 824004213,
"EmitPR": 300,
"From": 3,
"Where": [],
@ -50493,7 +50489,7 @@
"RevisiParams": []
},
{
"Id": 813002214,
"Id": 824004214,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -50502,7 +50498,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
451305111,
482400422,
-1,
-1
],
@ -50516,7 +50512,7 @@
"RevisiParams": []
},
{
"Id": 813002215,
"Id": 824004215,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -50841,7 +50837,7 @@
"RevisiParams": []
},
{
"Id": 834002313,
"Id": 934002313,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -50865,7 +50861,7 @@
"RevisiParams": []
},
{
"Id": 834002314,
"Id": 934002314,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -51380,7 +51376,7 @@
"RevisiParams": []
},
{
"Id": 843001311,
"Id": 943001313,
"EmitPR": 500,
"From": 4,
"Where": [],
@ -51716,7 +51712,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
483400722,
390001543,
1000,
1,
2
@ -51848,7 +51844,7 @@
"RevisiParams": []
},
{
"Id": 843006215,
"Id": 943006215,
"EmitPR": 1000,
"From": 4,
"Where": [],
@ -52983,7 +52979,7 @@
391000012,
1000,
1,
1
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -53559,7 +53555,7 @@
},
{
"Id": 834005213,
"EmitPR": 1000,
"EmitPR": 180,
"From": 3,
"Where": [],
"Order": "",
@ -54221,7 +54217,7 @@
"RevisiParams": []
},
{
"Id": 924004111,
"Id": 913002111,
"EmitPR": 1000,
"From": 4,
"Where": [],
@ -54245,7 +54241,7 @@
"RevisiParams": []
},
{
"Id": 924004311,
"Id": 913002311,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -54269,7 +54265,7 @@
"RevisiParams": []
},
{
"Id": 924004312,
"Id": 913002312,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -54986,7 +54982,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
481300321,
491300311,
-1,
-1
],
@ -55587,7 +55583,7 @@
"RevisiParams": []
},
{
"Id": 913002311,
"Id": 924004311,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -55611,7 +55607,7 @@
"RevisiParams": []
},
{
"Id": 913002312,
"Id": 924004312,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -55635,7 +55631,7 @@
"RevisiParams": []
},
{
"Id": 913002313,
"Id": 924004313,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -55974,7 +55970,7 @@
391000007,
1000,
1,
1
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -56152,7 +56148,7 @@
"RevisiParams": []
},
{
"Id": 943001313,
"Id": 843001313,
"EmitPR": 300,
"From": 4,
"Where": [],
@ -56732,7 +56728,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
414005211,
491400531,
-1,
-1
],
@ -56779,7 +56775,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
414005211,
491400532,
-1,
-1
],
@ -57858,7 +57854,7 @@
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001007,
391000008,
1000,
1,
1

9955
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

1358
bin/json/game_skillbuff.json
View File

File diff suppressed because it is too large Load Diff

4
bin/json/game_skillpassive.json
View File

@ -530,7 +530,7 @@
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"MaxEmitTimesInRound": 99,
"Callback": [
215005212
]
@ -594,7 +594,7 @@
]
},
{
"Id": 414007211,
"Id": 0,
"When": 14,
"FromCheck": "Target=2",
"TargetCheck": "Target=3",

22
bin/json/game_topuiconfig.json
View File

@ -2604,5 +2604,27 @@
"id": "roledisplay",
"subId": "",
"currencyField": []
},
{
"id": "mainlineshop",
"subId": "",
"currencyField": [
{
"a": "item",
"t": "24010001",
"n": 0
}
]
},
{
"id": "mainlineinfo",
"subId": "",
"currencyField": [
{
"a": "item",
"t": "24010001",
"n": 0
}
]
}
]

62
bin/json/game_trendchose.json
View File

@ -9,8 +9,8 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_01",
"text": "考试选项1"
"key": "trendchose_trendchose_all_chosetxt_01",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 1,
@ -32,11 +32,11 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_02",
"text": "考试选项2"
"key": "trendchose_trendchose_all_chosetxt_02",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 2,
"chosenum": 1,
"startstory": 10000400,
"constory": 0,
"get": [],
@ -55,11 +55,11 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_03",
"text": "考试选项3"
"key": "trendchose_trendchose_all_chosetxt_03",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 3,
"chosenum": 1,
"startstory": 10000400,
"constory": 0,
"get": [],
@ -78,11 +78,11 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_04",
"text": "考试选项4"
"key": "trendchose_trendchose_all_chosetxt_04",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 4,
"chosenum": 1,
"startstory": 10000400,
"constory": 0,
"get": [],
@ -101,11 +101,11 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_05",
"text": "考试选项5"
"key": "trendchose_trendchose_all_chosetxt_05",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 5,
"chosenum": 1,
"startstory": 10000400,
"constory": 0,
"get": [],
@ -124,8 +124,8 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_06",
"text": "考试选项6"
"key": "trendchose_trendchose_all_chosetxt_06",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 1,
@ -147,11 +147,11 @@
"功能入口-维京远征"
],
"chosetxt": {
"key": "chosetxt_07",
"text": "考试选项7"
"key": "trendchose_trendchose_all_chosetxt_07",
"text": "开始考核"
},
"chosetype": 1,
"chosenum": 2,
"chosenum": 1,
"startstory": 10000400,
"constory": 0,
"get": [],
@ -170,8 +170,8 @@
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_08",
"text": "买乳猪1"
"key": "trendchose_trendchose_all_chosetxt_08",
"text": "尝试买一个乳猪"
},
"chosetype": 2,
"chosenum": 0,
@ -195,8 +195,8 @@
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_09",
"text": "买乳猪2"
"key": "trendchose_trendchose_all_chosetxt_09",
"text": "尝试买一个乳猪"
},
"chosetype": 2,
"chosenum": 0,
@ -220,8 +220,8 @@
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_10",
"text": "买乳猪3"
"key": "trendchose_trendchose_all_chosetxt_10",
"text": "尝试买一个乳猪"
},
"chosetype": 2,
"chosenum": 0,
@ -245,15 +245,15 @@
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_11",
"text": "买乳猪4"
"key": "trendchose_trendchose_all_chosetxt_11",
"text": "尝试买一个乳猪"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 10000351,
"constory": 10000352,
"get": [
1004
1001
],
"aginstory": 0,
"lose": [],
@ -270,15 +270,15 @@
"功能入口-烹饪"
],
"chosetxt": {
"key": "chosetxt_12",
"text": "买乳猪5"
"key": "trendchose_trendchose_all_chosetxt_12",
"text": "尝试买一个乳猪"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 10000371,
"constory": 10000372,
"get": [
1005
1002
],
"aginstory": 0,
"lose": [],

4
bin/json/game_vikingbossskill.json
View File

@ -111,11 +111,11 @@
"key": "vikingexpedition_bossskill_introduce_6",
"text": "梦境回廊，产出经验材料"
},
"icon": "ytx_js_25001",
"icon": "hkz_tx_jyfb",
"guardskill": [
125001111,
125001211
],
"bossIcon": "sl_rk_boss01"
"bossIcon": "xmwg_jyfb_boss1"
}
]

81
bin/json/game_worldall.json
View File

@ -98,7 +98,20 @@
"id": 301,
"name": {
"key": "worldtask_world_all_name_6",
"text": "守护：中轴城二三事"
"text": "功夫熊猫"
},
"task_icon": "",
"task_txt": {
"key": "",
"text": ""
},
"reword": []
},
{
"id": 302,
"name": {
"key": "worldtask_world_all_name_7",
"text": "驯龙高手"
},
"task_icon": "",
"task_txt": {
@ -110,7 +123,7 @@
{
"id": 1010,
"name": {
"key": "worldtask_world_all_name_11",
"key": "worldtask_world_all_name_8",
"text": "日常测试1"
},
"task_icon": "",
@ -123,7 +136,7 @@
{
"id": 1020,
"name": {
"key": "worldtask_world_all_name_12",
"key": "worldtask_world_all_name_9",
"text": "日常测试2"
},
"task_icon": "",
@ -136,7 +149,7 @@
{
"id": 1030,
"name": {
"key": "worldtask_world_all_name_13",
"key": "worldtask_world_all_name_10",
"text": "日常测试3"
},
"task_icon": "",
@ -149,7 +162,7 @@
{
"id": 1040,
"name": {
"key": "worldtask_world_all_name_14",
"key": "worldtask_world_all_name_11",
"text": "日常测试4"
},
"task_icon": "",
@ -162,7 +175,7 @@
{
"id": 1050,
"name": {
"key": "worldtask_world_all_name_15",
"key": "worldtask_world_all_name_12",
"text": "日常测试5"
},
"task_icon": "",
@ -175,7 +188,7 @@
{
"id": 1060,
"name": {
"key": "worldtask_world_all_name_16",
"key": "worldtask_world_all_name_13",
"text": "日常测试6"
},
"task_icon": "",
@ -188,7 +201,7 @@
{
"id": 1070,
"name": {
"key": "worldtask_world_all_name_17",
"key": "worldtask_world_all_name_14",
"text": "日常测试7"
},
"task_icon": "",
@ -201,7 +214,7 @@
{
"id": 1080,
"name": {
"key": "worldtask_world_all_name_18",
"key": "worldtask_world_all_name_15",
"text": "日常测试8"
},
"task_icon": "",
@ -214,7 +227,7 @@
{
"id": 1090,
"name": {
"key": "worldtask_world_all_name_19",
"key": "worldtask_world_all_name_16",
"text": "日常测试9"
},
"task_icon": "",
@ -227,7 +240,7 @@
{
"id": 1100,
"name": {
"key": "worldtask_world_all_name_20",
"key": "worldtask_world_all_name_17",
"text": "日常测试10"
},
"task_icon": "",
@ -240,7 +253,7 @@
{
"id": 1110,
"name": {
"key": "worldtask_world_all_name_21",
"key": "worldtask_world_all_name_18",
"text": "日常测试11"
},
"task_icon": "",
@ -253,7 +266,7 @@
{
"id": 1120,
"name": {
"key": "worldtask_world_all_name_22",
"key": "worldtask_world_all_name_19",
"text": "日常测试12"
},
"task_icon": "",
@ -266,7 +279,7 @@
{
"id": 1130,
"name": {
"key": "worldtask_world_all_name_23",
"key": "worldtask_world_all_name_20",
"text": "日常测试13"
},
"task_icon": "",
@ -279,7 +292,7 @@
{
"id": 1140,
"name": {
"key": "worldtask_world_all_name_24",
"key": "worldtask_world_all_name_21",
"text": "日常测试14"
},
"task_icon": "",
@ -292,7 +305,7 @@
{
"id": 1150,
"name": {
"key": "worldtask_world_all_name_25",
"key": "worldtask_world_all_name_22",
"text": "日常测试15"
},
"task_icon": "",
@ -305,7 +318,7 @@
{
"id": 1160,
"name": {
"key": "worldtask_world_all_name_26",
"key": "worldtask_world_all_name_23",
"text": "日常测试16"
},
"task_icon": "",
@ -318,7 +331,7 @@
{
"id": 1170,
"name": {
"key": "worldtask_world_all_name_27",
"key": "worldtask_world_all_name_24",
"text": "日常测试17"
},
"task_icon": "",
@ -331,7 +344,7 @@
{
"id": 1180,
"name": {
"key": "worldtask_world_all_name_28",
"key": "worldtask_world_all_name_25",
"text": "日常测试18"
},
"task_icon": "",
@ -344,7 +357,7 @@
{
"id": 1190,
"name": {
"key": "worldtask_world_all_name_29",
"key": "worldtask_world_all_name_26",
"text": "日常测试19"
},
"task_icon": "",
@ -357,7 +370,7 @@
{
"id": 1200,
"name": {
"key": "worldtask_world_all_name_30",
"key": "worldtask_world_all_name_27",
"text": "日常测试20"
},
"task_icon": "",
@ -370,7 +383,7 @@
{
"id": 1210,
"name": {
"key": "worldtask_world_all_name_31",
"key": "worldtask_world_all_name_28",
"text": "日常测试21"
},
"task_icon": "",
@ -383,7 +396,7 @@
{
"id": 1220,
"name": {
"key": "worldtask_world_all_name_32",
"key": "worldtask_world_all_name_29",
"text": "日常测试22"
},
"task_icon": "",
@ -396,7 +409,7 @@
{
"id": 1230,
"name": {
"key": "worldtask_world_all_name_33",
"key": "worldtask_world_all_name_30",
"text": "日常测试23"
},
"task_icon": "",
@ -409,7 +422,7 @@
{
"id": 1240,
"name": {
"key": "worldtask_world_all_name_34",
"key": "worldtask_world_all_name_31",
"text": "日常测试24"
},
"task_icon": "",
@ -422,7 +435,7 @@
{
"id": 1250,
"name": {
"key": "worldtask_world_all_name_35",
"key": "worldtask_world_all_name_32",
"text": "日常测试25"
},
"task_icon": "",
@ -435,7 +448,7 @@
{
"id": 1260,
"name": {
"key": "worldtask_world_all_name_36",
"key": "worldtask_world_all_name_33",
"text": "日常测试26"
},
"task_icon": "",
@ -448,7 +461,7 @@
{
"id": 1270,
"name": {
"key": "worldtask_world_all_name_37",
"key": "worldtask_world_all_name_34",
"text": "日常测试27"
},
"task_icon": "",
@ -461,7 +474,7 @@
{
"id": 1280,
"name": {
"key": "worldtask_world_all_name_38",
"key": "worldtask_world_all_name_35",
"text": "日常测试28"
},
"task_icon": "",
@ -474,7 +487,7 @@
{
"id": 1290,
"name": {
"key": "worldtask_world_all_name_39",
"key": "worldtask_world_all_name_36",
"text": "日常测试29"
},
"task_icon": "",
@ -487,7 +500,7 @@
{
"id": 1300,
"name": {
"key": "worldtask_world_all_name_40",
"key": "worldtask_world_all_name_37",
"text": "日常测试30"
},
"task_icon": "",
@ -500,7 +513,7 @@
{
"id": 1310,
"name": {
"key": "worldtask_world_all_name_41",
"key": "worldtask_world_all_name_38",
"text": "日常测试31"
},
"task_icon": "",
@ -513,7 +526,7 @@
{
"id": 1320,
"name": {
"key": "worldtask_world_all_name_42",
"key": "worldtask_world_all_name_39",
"text": "日常测试32"
},
"task_icon": "",
@ -526,7 +539,7 @@
{
"id": 1330,
"name": {
"key": "worldtask_world_all_name_43",
"key": "worldtask_world_all_name_40",
"text": "日常测试33"
},
"task_icon": "",

540
bin/json/game_worldtask.json
View File

@ -5377,258 +5377,6 @@
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20040,
"id_after": 300040,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_130",
"text": "驯龙小队的一天一"
},
"task_details": {
"key": "worldtask_world_task_task_details_130",
"text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_130",
"text": "和希卡普聊聊"
},
"get_item": [],
"trigger": 0,
"npc": 300030,
"completetask": [
14000003
],
"deliver_npc": 300039,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300040,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300030,
"id_after": 300050,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_131",
"text": "驯龙小队的一天二"
},
"task_details": {
"key": "worldtask_world_task_task_details_131",
"text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_131",
"text": "阻止鼻涕粗"
},
"get_item": [],
"trigger": 0,
"npc": 300040,
"completetask": [
14000004
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300050,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300040,
"id_after": 300060,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_132",
"text": "驯龙小队的一天三"
},
"task_details": {
"key": "worldtask_world_task_task_details_132",
"text": "亚丝翠情绪激动，你不能让他们互相伤害。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_132",
"text": "阻止亚丝翠"
},
"get_item": [],
"trigger": 0,
"npc": 300050,
"completetask": [
14000005
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300060,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300050,
"id_after": 300061,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_133",
"text": "驯龙小队的一天四"
},
"task_details": {
"key": "worldtask_world_task_task_details_133",
"text": "希卡普看上去很生气。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_133",
"text": "和希卡普聊聊"
},
"get_item": [],
"trigger": 0,
"npc": 300060,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300061,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300060,
"id_after": 300062,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_134",
"text": "驯龙小队的一天五"
},
"task_details": {
"key": "worldtask_world_task_task_details_134",
"text": "和鼻涕粗沟通，让他知道问题出在哪。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_134",
"text": "找到鼻涕粗"
},
"get_item": [],
"trigger": 0,
"npc": 300610,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300062,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300061,
"id_after": 0,
"group": 301,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_135",
"text": "驯龙小队的一天终"
},
"task_details": {
"key": "worldtask_world_task_task_details_135",
"text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_135",
"text": "让他们和好如初"
},
"get_item": [],
"trigger": 0,
"npc": 300620,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300070,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20060,
"id_after": 0,
"group": 301,
@ -5665,14 +5413,266 @@
],
"module": []
},
{
"key": 300040,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20040,
"id_after": 300050,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_130",
"text": "驯龙小队的一天一"
},
"task_details": {
"key": "worldtask_world_task_task_details_130",
"text": "希卡普约着他的伙伴们一起做龙鞍，快帮他们收集制作材料吧。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_130",
"text": "和希卡普聊聊"
},
"get_item": [],
"trigger": 0,
"npc": 300030,
"completetask": [
14000003
],
"deliver_npc": 300039,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300050,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300040,
"id_after": 300060,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_131",
"text": "驯龙小队的一天二"
},
"task_details": {
"key": "worldtask_world_task_task_details_131",
"text": "原本好好制作龙鞍的鼻涕粗突然和亚丝翠吵了起来，得上前阻止他们。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_131",
"text": "阻止鼻涕粗"
},
"get_item": [],
"trigger": 0,
"npc": 300040,
"completetask": [
14000004
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300060,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300050,
"id_after": 300070,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_132",
"text": "驯龙小队的一天三"
},
"task_details": {
"key": "worldtask_world_task_task_details_132",
"text": "亚丝翠情绪激动，你不能让他们互相伤害。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_132",
"text": "阻止亚丝翠"
},
"get_item": [],
"trigger": 0,
"npc": 300050,
"completetask": [
14000005
],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300070,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300060,
"id_after": 300080,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_133",
"text": "驯龙小队的一天四"
},
"task_details": {
"key": "worldtask_world_task_task_details_133",
"text": "希卡普看上去很生气。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_133",
"text": "和希卡普聊聊"
},
"get_item": [],
"trigger": 0,
"npc": 300060,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300080,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300070,
"id_after": 300090,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_134",
"text": "驯龙小队的一天五"
},
"task_details": {
"key": "worldtask_world_task_task_details_134",
"text": "和鼻涕粗沟通，让他知道问题出在哪。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_134",
"text": "找到鼻涕粗"
},
"get_item": [],
"trigger": 0,
"npc": 300610,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300090,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 300080,
"id_after": 0,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
"task_name": {
"key": "worldtask_world_task_task_name_135",
"text": "驯龙小队的一天终"
},
"task_details": {
"key": "worldtask_world_task_task_details_135",
"text": "为了让驯龙小队重归于好，你准备去找鼻涕粗聊聊。"
},
"npctxt": {
"key": "worldtask_world_task_npctxt_135",
"text": "让他们和好如初"
},
"get_item": [],
"trigger": 0,
"npc": 300620,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,
"lock_add": 0,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 500
}
],
"module": []
},
{
"key": 300100,
"opencond": "",
"lock": 1,
"lockend": 999,
"ontxe": 20070,
"id_after": 0,
"group": 301,
"group": 302,
"exgroup": 310,
"des": 3,
"icon": "25001",
@ -7216,10 +7216,8 @@
"get_item": [],
"trigger": 0,
"npc": 60290,
"completetask": [
50000039
],
"deliver_npc": 60298,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7272,7 +7270,7 @@
"completetask": [
50000040
],
"deliver_npc": 60308,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7322,10 +7320,8 @@
"get_item": [],
"trigger": 0,
"npc": 60320,
"completetask": [
50000042
],
"deliver_npc": 60328,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7378,7 +7374,7 @@
"completetask": [
50000043
],
"deliver_npc": 60338,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7428,10 +7424,8 @@
"get_item": [],
"trigger": 0,
"npc": 60350,
"completetask": [
50000045
],
"deliver_npc": 60358,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7484,7 +7478,7 @@
"completetask": [
50000046
],
"deliver_npc": 60368,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7537,7 +7531,7 @@
"completetask": [
50000048
],
"deliver_npc": 60388,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7587,10 +7581,8 @@
"get_item": [],
"trigger": 0,
"npc": 60410,
"completetask": [
50000051
],
"deliver_npc": 60418,
"completetask": [],
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,
@ -7643,7 +7635,7 @@
"completetask": [
50000052
],
"deliver_npc": 60428,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 1,

33
modules/shop/api_buy.go
View File

@ -32,9 +32,6 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
need []*cfg.Gameatn
give []*cfg.Gameatn
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
equi *pb.DB_Equipment
equiconf *cfg.GameEquipData
equibuyconf *cfg.GameShopBuyequiCosData
)
if errdata = this.BuyCheck(session, req); errdata != nil {
return
@ -144,43 +141,17 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
return
}
good.Buy += req.BuyNum
if !conf.Preview {
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
} else { //装备价格采用计算价格
equi = record.Preview[req.Gid]
if equiconf, err = this.module.configure.getGameEquipData(equi.CId); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
lv := int32(0)
if equi.AdverbEntry != nil {
lv = int32(len(equi.AdverbEntry))
}
if equibuyconf, err = this.module.configure.getShopBuyequiCosData(equiconf.InitLv, lv); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if errdata = this.module.ConsumeRes(session, equibuyconf.Suittype, true); errdata != nil {
return
}
}
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record})
if !conf.Preview {
if errdata = this.module.DispenseRes(session, give, true); errdata != nil {
return
}
} else {
if errdata = this.module.equip.AddEquipment(session, record.Preview[req.Gid]); errdata != nil {
if errdata = this.module.equip.AddEquipment(session, record.Preview[req.Gid].Equipment); errdata != nil {
return
}
}

83
modules/shop/api_getlist.go
View File

@ -34,6 +34,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
goods []*pb.ShopItem
tdata time.Duration
ltime time.Duration
equiconf *cfg.GameEquipData
equibuyconf *cfg.GameShopBuyequiCosData
leftrefnum int32
)
if errdata = this.GetlistCheck(session, req); errdata != nil {
@ -126,7 +128,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
ltime = 30 * 7 * 24 * time.Hour * time.Duration(shopconf.Rtime)
break
}
if req.IsManualRefresh && shopconf.Rnum > 0 { //可以手动刷新
isrefresh := false
if refresh > 0 { //
@ -173,7 +174,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
sdata.ManualRefreshNum++
sdata.Leftfreerefreshnum = refresh - shopData.RefreshnumgoldShop
sdata.Items = make([]*pb.UserShopGood, len(items))
sdata.Preview = make(map[int32]*pb.DB_Equipment)
sdata.Preview = make(map[int32]*pb.UserShopDataEx)
for i, v := range items {
id := v.Key*100 + int32(i)
sdata.Items[i] = &pb.UserShopGood{
@ -182,9 +183,38 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
Buy: 0,
}
if v.Preview { //是否预览
if errdata, sdata.Preview[id] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil {
sdata.Preview[id] = &pb.UserShopDataEx{}
if errdata, sdata.Preview[id].Equipment = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil {
return
}
if equiconf, err = this.module.configure.getGameEquipData(v.Iteminfo[0].T); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
lv := int32(0)
if sdata.Preview[id].Equipment.AdverbEntry != nil {
lv = int32(len(sdata.Preview[id].Equipment.AdverbEntry))
}
if equibuyconf, err = this.module.configure.getShopBuyequiCosData(equiconf.InitLv, lv); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
for _, v1 := range equibuyconf.Suittype {
sdata.Preview[id].Need = append(sdata.Preview[id].Need, &pb.UserAssets{
A: v1.A,
T: v1.T,
N: v1.N,
})
}
}
}
goods = transGoods(items, sdata)
@ -223,7 +253,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
sdata.LastRefreshTime = configure.Now().Unix()
sdata.Items = make([]*pb.UserShopGood, len(items))
sdata.Preview = make(map[int32]*pb.DB_Equipment)
sdata.Preview = make(map[int32]*pb.UserShopDataEx)
for i, v := range items {
id := v.Key*100 + int32(i)
sdata.Items[i] = &pb.UserShopGood{
@ -232,9 +262,38 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
Buy: 0,
}
if v.Preview { //是否预览
if errdata, sdata.Preview[id] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil {
sdata.Preview[id] = &pb.UserShopDataEx{}
if errdata, sdata.Preview[id].Equipment = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil {
return
}
if equiconf, err = this.module.configure.getGameEquipData(v.Iteminfo[0].T); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
lv := int32(0)
if sdata.Preview[id].Equipment.AdverbEntry != nil {
lv = int32(len(sdata.Preview[id].Equipment.AdverbEntry))
}
if equibuyconf, err = this.module.configure.getShopBuyequiCosData(equiconf.InitLv, lv); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
for _, v1 := range equibuyconf.Suittype {
sdata.Preview[id].Need = append(sdata.Preview[id].Need, &pb.UserAssets{
A: v1.A,
T: v1.T,
N: v1.N,
})
}
}
}
goods = transGoods(items, sdata)
@ -255,20 +314,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
return
}
// sdata.Preview = make(map[int32]*pb.DB_Equipment)
// for i, v := range items {
// id := v.Key*100 + int32(i)
// sdata.Items[i] = &pb.UserShopGood{
// Id: id,
// Gid: v.Key,
// Buy: 0,
// }
// if v.Preview { //是否预览
// if errdata, sdata.Preview[id] = this.module.equip.NewEquipment(session.GetUserId(), v.Iteminfo[0].T); errdata != nil {
// return
// }
// }
// }
goods = transGoods(items, sdata)
}
} else {

6
modules/shop/core.go
View File

@ -49,6 +49,7 @@ func transGoods(goods []*cfg.GameShopitemData, sdata *pb.UserShopData) (result [
N: v1.N,
}
}
if sdata.Preview[id] == nil {
result[i].Consume = make([]*pb.UserAssets, len(v.Need))
for i1, v1 := range v.Need {
result[i].Consume[i1] = &pb.UserAssets{
@ -57,7 +58,10 @@ func transGoods(goods []*cfg.GameShopitemData, sdata *pb.UserShopData) (result [
N: int32(math.Ceil(float64(v1.N) * float64(v.Sale) / float64(1000))),
}
}
result[i].Preview = sdata.Preview[id]
} else {
result[i].Consume = sdata.Preview[id].Need
}
result[i].Preview = sdata.Preview[id].Equipment
}
return
}

253
pb/shop_db.pb.go
View File

@ -155,7 +155,7 @@ type UserShopData struct {
LastRefreshTime int64 `protobuf:"varint,1,opt,name=LastRefreshTime,proto3" json:"LastRefreshTime"` //最后一次刷新时间
ManualRefreshNum int32 `protobuf:"varint,2,opt,name=ManualRefreshNum,proto3" json:"ManualRefreshNum"` //手动刷新次数
Items []*UserShopGood `protobuf:"bytes,3,rep,name=Items,proto3" json:"Items"` //商品列表
Preview map[int32]*DB_Equipment `protobuf:"bytes,5,rep,name=preview,proto3" json:"preview" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //预览数据
Preview map[int32]*UserShopDataEx `protobuf:"bytes,5,rep,name=preview,proto3" json:"preview" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //预览数据
Leftfreerefreshnum int32 `protobuf:"varint,6,opt,name=leftfreerefreshnum,proto3" json:"leftfreerefreshnum"` //剩余免费刷新次数
}
@ -212,7 +212,7 @@ func (x *UserShopData) GetItems() []*UserShopGood {
return nil
}
func (x *UserShopData) GetPreview() map[int32]*DB_Equipment {
func (x *UserShopData) GetPreview() map[int32]*UserShopDataEx {
if x != nil {
return x.Preview
}
@ -226,6 +226,61 @@ func (x *UserShopData) GetLeftfreerefreshnum() int32 {
return 0
}
type UserShopDataEx struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Equipment *DB_Equipment `protobuf:"bytes,1,opt,name=equipment,proto3" json:"equipment"` //装备
Need []*UserAssets `protobuf:"bytes,2,rep,name=Need,proto3" json:"Need"` //消耗
}
func (x *UserShopDataEx) Reset() {
*x = UserShopDataEx{}
if protoimpl.UnsafeEnabled {
mi := &file_shop_shop_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *UserShopDataEx) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*UserShopDataEx) ProtoMessage() {}
func (x *UserShopDataEx) ProtoReflect() protoreflect.Message {
mi := &file_shop_shop_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use UserShopDataEx.ProtoReflect.Descriptor instead.
func (*UserShopDataEx) Descriptor() ([]byte, []int) {
return file_shop_shop_db_proto_rawDescGZIP(), []int{2}
}
func (x *UserShopDataEx) GetEquipment() *DB_Equipment {
if x != nil {
return x.Equipment
}
return nil
}
func (x *UserShopDataEx) GetNeed() []*UserAssets {
if x != nil {
return x.Need
}
return nil
}
type DBShop struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -247,7 +302,7 @@ type DBShop struct {
func (x *DBShop) Reset() {
*x = DBShop{}
if protoimpl.UnsafeEnabled {
mi := &file_shop_shop_db_proto_msgTypes[2]
mi := &file_shop_shop_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -260,7 +315,7 @@ func (x *DBShop) String() string {
func (*DBShop) ProtoMessage() {}
func (x *DBShop) ProtoReflect() protoreflect.Message {
mi := &file_shop_shop_db_proto_msgTypes[2]
mi := &file_shop_shop_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -273,7 +328,7 @@ func (x *DBShop) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBShop.ProtoReflect.Descriptor instead.
func (*DBShop) Descriptor() ([]byte, []int) {
return file_shop_shop_db_proto_rawDescGZIP(), []int{2}
return file_shop_shop_db_proto_rawDescGZIP(), []int{3}
}
func (x *DBShop) GetId() string {
@ -357,70 +412,77 @@ var File_shop_shop_db_proto protoreflect.FileDescriptor
var file_shop_shop_db_proto_rawDesc = []byte{
0x0a, 0x12, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x73, 0x68, 0x6f, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f,
0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x22, 0x42, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f,
0x6f, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x03, 0x67, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x62, 0x75, 0x79, 0x22, 0xba, 0x02, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53,
0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
0x52, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d,
0x65, 0x12, 0x2a, 0x0a, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e,
0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x23, 0x0a,
0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55,
0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x52, 0x05, 0x49, 0x74, 0x65,
0x6d, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x18, 0x05, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61,
0x74, 0x61, 0x2e, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74,
0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x06,
0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x1a, 0x49, 0x0a, 0x0c, 0x50, 0x72, 0x65, 0x76,
0x69, 0x65, 0x77, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45,
0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0xc7, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f,
0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x72, 0x65,
0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70,
0x12, 0x30, 0x0a, 0x13, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67,
0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x72,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68,
0x6f, 0x70, 0x12, 0x29, 0x0a, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05,
0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x42,
0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64,
0x12, 0x10, 0x0a, 0x03, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62,
0x75, 0x79, 0x22, 0xbc, 0x02, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44,
0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x4c, 0x61,
0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a,
0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75,
0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x23, 0x0a, 0x05, 0x49, 0x74, 0x65,
0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53,
0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x34,
0x0a, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x1a, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x50,
0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x70, 0x72, 0x65,
0x76, 0x69, 0x65, 0x77, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65,
0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
0x52, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x6e, 0x75, 0x6d, 0x1a, 0x4b, 0x0a, 0x0c, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70,
0x44, 0x61, 0x74, 0x61, 0x45, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x22, 0x5e, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
0x61, 0x45, 0x78, 0x12, 0x2b, 0x0a, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69,
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x09, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
0x12, 0x1f, 0x0a, 0x04, 0x4e, 0x65, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x4e, 0x65, 0x65,
0x64, 0x22, 0xc7, 0x03, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x0e, 0x0a, 0x02,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e,
0x0a, 0x12, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, 0x64,
0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x72, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x30,
0x0a, 0x13, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c,
0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70,
0x12, 0x29, 0x0a, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
0x61, 0x52, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64,
0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52,
0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07,
0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76,
0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70,
0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f,
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31,
0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x09,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44,
0x61, 0x74, 0x61, 0x52, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a,
0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x06, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
0x61, 0x52, 0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27,
0x0a, 0x07, 0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68,
0x6f, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53,
0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70,
0x12, 0x31, 0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70,
0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f,
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53,
0x68, 0x6f, 0x70, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x18,
0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70,
0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2d,
0x0a, 0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0b, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
0x61, 0x52, 0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x2a, 0x7d, 0x0a,
0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c,
0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10,
0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70,
0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12,
0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c,
0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c,
0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a,
0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f,
0x70, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0a, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61,
0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2d, 0x0a, 0x0a,
0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52,
0x0a, 0x73, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x2a, 0x7d, 0x0a, 0x08, 0x53,
0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10,
0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12,
0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02,
0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a,
0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c,
0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08,
0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x6d,
0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -436,31 +498,35 @@ func file_shop_shop_db_proto_rawDescGZIP() []byte {
}
var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_shop_shop_db_proto_goTypes = []interface{}{
(ShopType)(0), // 0: ShopType
(*UserShopGood)(nil), // 1: UserShopGood
(*UserShopData)(nil), // 2: UserShopData
(*DBShop)(nil), // 3: DBShop
nil, // 4: UserShopData.PreviewEntry
(*DB_Equipment)(nil), // 5: DB_Equipment
(*UserShopDataEx)(nil), // 3: UserShopDataEx
(*DBShop)(nil), // 4: DBShop
nil, // 5: UserShopData.PreviewEntry
(*DB_Equipment)(nil), // 6: DB_Equipment
(*UserAssets)(nil), // 7: UserAssets
}
var file_shop_shop_db_proto_depIdxs = []int32{
1, // 0: UserShopData.Items:type_name -> UserShopGood
4, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry
2, // 2: DBShop.goldShop:type_name -> UserShopData
2, // 3: DBShop.diamondShop:type_name -> UserShopData
2, // 4: DBShop.pvpShop:type_name -> UserShopData
2, // 5: DBShop.pveShop:type_name -> UserShopData
2, // 6: DBShop.allianceShop:type_name -> UserShopData
2, // 7: DBShop.heroShop:type_name -> UserShopData
2, // 8: DBShop.smithyShop:type_name -> UserShopData
5, // 9: UserShopData.PreviewEntry.value:type_name -> DB_Equipment
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension extendee
0, // [0:10] is the sub-list for field type_name
5, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry
6, // 2: UserShopDataEx.equipment:type_name -> DB_Equipment
7, // 3: UserShopDataEx.Need:type_name -> UserAssets
2, // 4: DBShop.goldShop:type_name -> UserShopData
2, // 5: DBShop.diamondShop:type_name -> UserShopData
2, // 6: DBShop.pvpShop:type_name -> UserShopData
2, // 7: DBShop.pveShop:type_name -> UserShopData
2, // 8: DBShop.allianceShop:type_name -> UserShopData
2, // 9: DBShop.heroShop:type_name -> UserShopData
2, // 10: DBShop.smithyShop:type_name -> UserShopData
3, // 11: UserShopData.PreviewEntry.value:type_name -> UserShopDataEx
12, // [12:12] is the sub-list for method output_type
12, // [12:12] is the sub-list for method input_type
12, // [12:12] is the sub-list for extension type_name
12, // [12:12] is the sub-list for extension extendee
0, // [0:12] is the sub-list for field type_name
}
func init() { file_shop_shop_db_proto_init() }
@ -468,6 +534,7 @@ func file_shop_shop_db_proto_init() {
if File_shop_shop_db_proto != nil {
return
}
file_comm_proto_init()
file_equipment_equipment_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_shop_shop_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
@ -495,6 +562,18 @@ func file_shop_shop_db_proto_init() {
}
}
file_shop_shop_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserShopDataEx); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_shop_shop_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBShop); i {
case 0:
return &v.state
@ -513,7 +592,7 @@ func file_shop_shop_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_shop_shop_db_proto_rawDesc,
NumEnums: 1,
NumMessages: 4,
NumMessages: 5,
NumExtensions: 0,
NumServices: 0,
},