Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
7e4dd0575d
@ -5,7 +5,7 @@
|
||||
"card_pool_type": "base_pool1",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "24004",
|
||||
"id": "35006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -14,7 +14,7 @@
|
||||
"card_pool_type": "base_pool1",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "24004",
|
||||
"id": "35006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -23,7 +23,7 @@
|
||||
"card_pool_type": "base_pool1",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "24004",
|
||||
"id": "35006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -32,7 +32,7 @@
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "25001",
|
||||
"id": "34007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -41,7 +41,7 @@
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "25001",
|
||||
"id": "34007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -50,7 +50,7 @@
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "25001",
|
||||
"id": "34007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -59,7 +59,7 @@
|
||||
"card_pool_type": "base_pool3",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "25004",
|
||||
"id": "45003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -68,7 +68,7 @@
|
||||
"card_pool_type": "base_pool3",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "25004",
|
||||
"id": "45003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -77,7 +77,7 @@
|
||||
"card_pool_type": "base_pool3",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "25004",
|
||||
"id": "45003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -86,7 +86,7 @@
|
||||
"card_pool_type": "base_pool4",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "24008",
|
||||
"id": "14007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -95,7 +95,7 @@
|
||||
"card_pool_type": "base_pool4",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "24008",
|
||||
"id": "14007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -104,7 +104,7 @@
|
||||
"card_pool_type": "base_pool4",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "24008",
|
||||
"id": "14007",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -113,7 +113,7 @@
|
||||
"card_pool_type": "base_pool5",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "24003",
|
||||
"id": "34006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -122,7 +122,7 @@
|
||||
"card_pool_type": "base_pool5",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "24003",
|
||||
"id": "34006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -131,7 +131,7 @@
|
||||
"card_pool_type": "base_pool5",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "24003",
|
||||
"id": "34006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -140,7 +140,7 @@
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "44002",
|
||||
"id": "34002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -149,7 +149,7 @@
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "44002",
|
||||
"id": "34002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -158,268 +158,7 @@
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "44002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 19,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 3,
|
||||
"id": "34006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 20,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 4,
|
||||
"id": "45003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 21,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 4,
|
||||
"id": "44005",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 22,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "14003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 23,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "15005",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 24,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 2,
|
||||
"id": "24003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 25,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 2,
|
||||
"id": "24008",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 26,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "25001",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 27,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "25004",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 28,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 3,
|
||||
"id": "35006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 29,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 4,
|
||||
"id": "44002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 30,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 3,
|
||||
"race": 2,
|
||||
"id": "24002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 31,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 4,
|
||||
"race": 2,
|
||||
"id": "24004",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 32,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool2",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "35001",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 33,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 3,
|
||||
"race": 1,
|
||||
"id": "13003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 34,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 4,
|
||||
"id": "44006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 35,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "35001",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 36,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 4,
|
||||
"id": "44005",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 37,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "15004",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 38,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 3,
|
||||
"race": 2,
|
||||
"id": "24002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 39,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 4,
|
||||
"id": "45003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 40,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "14003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 41,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 1,
|
||||
"id": "15005",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 42,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 2,
|
||||
"id": "24003",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 43,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 2,
|
||||
"id": "24004",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 44,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "25004",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 45,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 3,
|
||||
"id": "34006",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 46,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 5,
|
||||
"race": 2,
|
||||
"id": "25001",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
"key": 47,
|
||||
"recruitment_type": 1,
|
||||
"card_pool_type": "base_pool6",
|
||||
"star": 4,
|
||||
"race": 1,
|
||||
"id": "14007",
|
||||
"id": "34002",
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -543,6 +543,10 @@
|
||||
"a": "item",
|
||||
"t": "500000",
|
||||
"n": 0
|
||||
}
|
||||
},
|
||||
"smithy_PurchaseType": [
|
||||
50,
|
||||
50
|
||||
]
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@ -100,5 +100,11 @@
|
||||
"open": true,
|
||||
"routrules": "~/worker",
|
||||
"describe": "附魔副本排行榜数据"
|
||||
},
|
||||
{
|
||||
"msgid": "pvp",
|
||||
"open": true,
|
||||
"routrules": "~/worker",
|
||||
"describe": "pvp"
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,29 +3,41 @@
|
||||
"customer_id": 1,
|
||||
"customer_type": 1,
|
||||
"customer_speak": {
|
||||
"key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。",
|
||||
"text": ""
|
||||
"key": "1",
|
||||
"text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。"
|
||||
},
|
||||
"goods": [],
|
||||
"reword": [],
|
||||
"reword": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"weight": 4500
|
||||
},
|
||||
{
|
||||
"customer_id": 2,
|
||||
"customer_type": 2,
|
||||
"customer_speak": {
|
||||
"key": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。",
|
||||
"text": ""
|
||||
"key": "2",
|
||||
"text": "我需要{0}件【{1}】，如果你暂时没有备货的话我可以在这等一段时间，但不会太久。"
|
||||
},
|
||||
"goods": [],
|
||||
"reword": [],
|
||||
"reword": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"weight": 4500
|
||||
},
|
||||
{
|
||||
"customer_id": 3,
|
||||
"customer_type": 3,
|
||||
"customer_speak": {
|
||||
"key": "",
|
||||
"key": "3",
|
||||
"text": ""
|
||||
},
|
||||
"goods": [],
|
||||
@ -36,11 +48,23 @@
|
||||
"customer_id": 4,
|
||||
"customer_type": 4,
|
||||
"customer_speak": {
|
||||
"key": "我有个宝贝，你要是喜欢的话便宜你点卖你。",
|
||||
"text": ""
|
||||
"key": "4",
|
||||
"text": "我有个宝贝，你要是喜欢的话便宜你点卖你。"
|
||||
},
|
||||
"goods": [],
|
||||
"reword": [],
|
||||
"goods": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"reword": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"weight": 500
|
||||
}
|
||||
]
|
||||
@ -2,27 +2,27 @@
|
||||
{
|
||||
"id": 1,
|
||||
"proficiency": 20,
|
||||
"reelId": 1,
|
||||
"proficiency_lv": 1,
|
||||
"reelId": 1,
|
||||
"title_text": {
|
||||
"key": "1",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "1",
|
||||
"text": "炉温消耗-{0}%"
|
||||
"text": "炉温消耗-{0}℃"
|
||||
},
|
||||
"type": 1,
|
||||
"value1": 100,
|
||||
"value1": 5,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"proficiency": 40,
|
||||
"reelId": 1,
|
||||
"proficiency_lv": 2,
|
||||
"reelId": 1,
|
||||
"title_text": {
|
||||
"key": "1",
|
||||
"key": "2",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
@ -31,15 +31,15 @@
|
||||
},
|
||||
"type": 2,
|
||||
"value1": 10001,
|
||||
"value2": -275
|
||||
"value2": -125
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"proficiency": 60,
|
||||
"reelId": 1,
|
||||
"proficiency_lv": 3,
|
||||
"reelId": 1,
|
||||
"title_text": {
|
||||
"key": "1",
|
||||
"key": "3",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
@ -53,324 +53,120 @@
|
||||
{
|
||||
"id": 4,
|
||||
"proficiency": 80,
|
||||
"reelId": 1,
|
||||
"proficiency_lv": 4,
|
||||
"reelId": 1,
|
||||
"title_text": {
|
||||
"key": "1",
|
||||
"key": "4",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "4",
|
||||
"text": "解锁套装"
|
||||
"text": "炉温消耗-{0}℃"
|
||||
},
|
||||
"type": 4,
|
||||
"type": 1,
|
||||
"value1": 5,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"proficiency": 100,
|
||||
"reelId": 1,
|
||||
"proficiency_lv": 5,
|
||||
"reelId": 1,
|
||||
"title_text": {
|
||||
"key": "1",
|
||||
"key": "5",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "5",
|
||||
"text": "{0}级装备售价提高{1}%"
|
||||
"text": "{0}%概率制造两件装备"
|
||||
},
|
||||
"type": 5,
|
||||
"value1": 1,
|
||||
"value2": 10
|
||||
"value1": 5,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"proficiency": 120,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"proficiency": 25,
|
||||
"proficiency_lv": 1,
|
||||
"reelId": 2,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "6",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "6",
|
||||
"text": "炉温消耗-{0}℃"
|
||||
},
|
||||
"type": 1,
|
||||
"value1": 0,
|
||||
"value1": 5,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"proficiency": 140,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"proficiency": 50,
|
||||
"proficiency_lv": 2,
|
||||
"reelId": 2,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "7",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "7",
|
||||
"text": "材料消耗减少"
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
"type": 2,
|
||||
"value1": 10001,
|
||||
"value2": -125
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"proficiency": 160,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"proficiency": 75,
|
||||
"proficiency_lv": 3,
|
||||
"reelId": 2,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "8",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "8",
|
||||
"text": "解锁图纸【紫金雷神锤】"
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"type": 3,
|
||||
"value1": 2,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"proficiency": 180,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"proficiency": 100,
|
||||
"proficiency_lv": 4,
|
||||
"reelId": 2,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "9",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "9",
|
||||
"text": "解锁套装"
|
||||
},
|
||||
"type": 0,
|
||||
"type": 4,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"proficiency": 200,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"proficiency": 125,
|
||||
"proficiency_lv": 5,
|
||||
"reelId": 2,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "10",
|
||||
"text": "lv.{0}:熟练度{1}"
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "10",
|
||||
"text": "{0}%概率制造两件装备"
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"proficiency": 220,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"proficiency": 240,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
"proficiency": 260,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
"proficiency": 280,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
"proficiency": 300,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 17,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 18,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 19,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 20,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"value2": 0
|
||||
},
|
||||
{
|
||||
"id": 22,
|
||||
"proficiency": 0,
|
||||
"reelId": 0,
|
||||
"proficiency_lv": 0,
|
||||
"title_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"content_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"type": 0,
|
||||
"value1": 0,
|
||||
"type": 5,
|
||||
"value1": 5,
|
||||
"value2": 0
|
||||
}
|
||||
]
|
||||
@ -323,7 +323,7 @@
|
||||
"id": 11,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 1,
|
||||
"preconditions": 5,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -339,7 +339,7 @@
|
||||
"id": 12,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 2,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -355,7 +355,7 @@
|
||||
"id": 13,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 3,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -371,7 +371,7 @@
|
||||
"id": 14,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 4,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -387,7 +387,7 @@
|
||||
"id": 15,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 5,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -403,7 +403,7 @@
|
||||
"id": 16,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 6,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -419,7 +419,7 @@
|
||||
"id": 17,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 7,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -435,7 +435,7 @@
|
||||
"id": 18,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 8,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -451,7 +451,7 @@
|
||||
"id": 19,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 9,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -467,7 +467,7 @@
|
||||
"id": 20,
|
||||
"skill_type": 2,
|
||||
"skill_lv": 10,
|
||||
"preconditions": 15,
|
||||
"preconditions": 10,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -483,7 +483,7 @@
|
||||
"id": 21,
|
||||
"skill_type": 3,
|
||||
"skill_lv": 1,
|
||||
"preconditions": 25,
|
||||
"preconditions": 20,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -499,7 +499,7 @@
|
||||
"id": 22,
|
||||
"skill_type": 3,
|
||||
"skill_lv": 2,
|
||||
"preconditions": 25,
|
||||
"preconditions": 21,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -515,7 +515,7 @@
|
||||
"id": 23,
|
||||
"skill_type": 3,
|
||||
"skill_lv": 3,
|
||||
"preconditions": 25,
|
||||
"preconditions": 22,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -531,7 +531,7 @@
|
||||
"id": 24,
|
||||
"skill_type": 3,
|
||||
"skill_lv": 4,
|
||||
"preconditions": 25,
|
||||
"preconditions": 23,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -547,7 +547,7 @@
|
||||
"id": 25,
|
||||
"skill_type": 3,
|
||||
"skill_lv": 5,
|
||||
"preconditions": 25,
|
||||
"preconditions": 24,
|
||||
"up_material": [],
|
||||
"name_text": {
|
||||
"key": "",
|
||||
@ -813,7 +813,7 @@
|
||||
"key": "41",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 6
|
||||
},
|
||||
{
|
||||
"id": 42,
|
||||
@ -829,7 +829,7 @@
|
||||
"key": "42",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 7
|
||||
},
|
||||
{
|
||||
"id": 43,
|
||||
@ -845,7 +845,7 @@
|
||||
"key": "43",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 8
|
||||
},
|
||||
{
|
||||
"id": 44,
|
||||
@ -861,7 +861,7 @@
|
||||
"key": "44",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 9
|
||||
},
|
||||
{
|
||||
"id": 45,
|
||||
@ -877,7 +877,7 @@
|
||||
"key": "45",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 10
|
||||
},
|
||||
{
|
||||
"id": 46,
|
||||
@ -893,7 +893,7 @@
|
||||
"key": "46",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 11
|
||||
},
|
||||
{
|
||||
"id": 47,
|
||||
@ -909,7 +909,7 @@
|
||||
"key": "47",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 12
|
||||
},
|
||||
{
|
||||
"id": 48,
|
||||
@ -925,7 +925,7 @@
|
||||
"key": "48",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 13
|
||||
},
|
||||
{
|
||||
"id": 49,
|
||||
@ -941,7 +941,7 @@
|
||||
"key": "49",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 14
|
||||
},
|
||||
{
|
||||
"id": 50,
|
||||
@ -957,6 +957,6 @@
|
||||
"key": "50",
|
||||
"text": "顾客购买装备数量上限提高至{0}件"
|
||||
},
|
||||
"value": 0
|
||||
"value": 15
|
||||
}
|
||||
]
|
||||
@ -120,6 +120,8 @@ var (
|
||||
ff(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): &formview.GrowtaskListView{},
|
||||
//worldtask
|
||||
ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): &formview.WorldtaskMineView{},
|
||||
//smithy
|
||||
ff(comm.ModuleSmithy, "customer"): &formview.SmithyView{},
|
||||
}
|
||||
)
|
||||
|
||||
@ -147,6 +149,7 @@ var (
|
||||
string(comm.ModuleGrowtask),
|
||||
string(comm.ModuleWorldtask),
|
||||
string(comm.ModuleReddot),
|
||||
string(comm.ModuleSmithy),
|
||||
},
|
||||
"gm": {ff(comm.ModuleGM, "cmd")},
|
||||
"sys": {
|
||||
@ -245,6 +248,9 @@ var (
|
||||
"worldtask": {
|
||||
ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine),
|
||||
},
|
||||
"smithy": {
|
||||
ff(comm.ModuleSmithy, "customer"),
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
@ -877,6 +883,19 @@ var (
|
||||
SubType: worldtask.WorldtaskSubtypeMine,
|
||||
Enabled: true,
|
||||
},
|
||||
// smithy
|
||||
string(comm.ModuleSmithy): {
|
||||
NavLabel: "铁匠铺",
|
||||
MainType: string(comm.ModuleSmithy),
|
||||
Enabled: true,
|
||||
},
|
||||
ff(comm.ModuleSmithy, "customer"): {
|
||||
NavLabel: "顾客",
|
||||
Desc: "当前铁匠铺中的顾客",
|
||||
MainType: string(comm.ModuleSmithy),
|
||||
SubType: "customer",
|
||||
Enabled: true,
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
35
cmd/v2/ui/views/smithy.go
Normal file
35
cmd/v2/ui/views/smithy.go
Normal file
@ -0,0 +1,35 @@
|
||||
package formview
|
||||
|
||||
import (
|
||||
"go_dreamfactory/cmd/v2/model"
|
||||
"go_dreamfactory/cmd/v2/service"
|
||||
"go_dreamfactory/pb"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SmithyView struct {
|
||||
BaseformView
|
||||
}
|
||||
|
||||
func (s *SmithyView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
//查询顾客
|
||||
loadCustomer := func() {
|
||||
if err := service.GetPttService().SendToClient(
|
||||
t.MainType,
|
||||
"customer",
|
||||
&pb.SmithyCustomerReq{},
|
||||
); err != nil {
|
||||
logrus.Error(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
customerBtn := widget.NewButton("顾客", loadCustomer)
|
||||
|
||||
btns := container.NewHBox(customerBtn)
|
||||
c := container.NewBorder(btns, nil, nil, nil)
|
||||
return c
|
||||
}
|
||||
@ -732,4 +732,13 @@ const (
|
||||
SmithyReelType2 = 2 // 材料消耗减少
|
||||
SmithyReelType3 = 3 // 解锁图纸【紫金雷神锤】
|
||||
SmithyReelType4 = 4
|
||||
SmithyReelType5 = 5 // 概率制造两件装备
|
||||
)
|
||||
|
||||
const (
|
||||
SmithyToolsSkill1 = 1 // 史诗品质概率提升
|
||||
SmithyToolsSkill2 = 2 // 所有装备售价提升
|
||||
SmithyToolsSkill3 = 3 // 所有图纸炉温消耗减少
|
||||
SmithyToolsSkill4 = 4 // 每日顾客数量提升至{0}人
|
||||
SmithyToolsSkill5 = 5 // 顾客购买装备数量上限提高至{0}件
|
||||
)
|
||||
|
||||
@ -23,7 +23,7 @@ func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (cod
|
||||
resp := &pb.FriendStopResp{
|
||||
IsSucc: true,
|
||||
}
|
||||
if err := session.SendMsg(string(this.moduleFriend.GetType()), FriendSubTypeQiecuo, resp); err != nil {
|
||||
if err := session.SendMsg(string(this.moduleFriend.GetType()), "stop", resp); err != nil {
|
||||
code = pb.ErrorCode_SystemError
|
||||
return
|
||||
}
|
||||
|
||||
@ -304,7 +304,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) {
|
||||
}
|
||||
stime := time.Now()
|
||||
// this.gateway.Debugf("----------3 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType)
|
||||
ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
|
||||
// ctx, _ := context.WithTimeout(context.Background(), time.Second*5)
|
||||
ctx := context.Background()
|
||||
if len(serviceTag) == 0 {
|
||||
// this.gateway.Debugf("----------4 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType)
|
||||
if err = this.gateway.Service().RpcCall(ctx, servicePath, string(comm.Rpc_GatewayRoute), req, reply); err != nil {
|
||||
|
||||
@ -140,6 +140,8 @@ func (this *configureComp) SetHeroDrawConfig() {
|
||||
err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
|
||||
return
|
||||
} else {
|
||||
this.hlock.Lock()
|
||||
defer this.hlock.Unlock()
|
||||
for _, v := range _configure.GetDataList() {
|
||||
if _, ok := this.drawCardCfg[v.CardPoolType]; !ok {
|
||||
this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GameDrawCardData, 0)
|
||||
|
||||
@ -497,8 +497,16 @@ func (this *ModelItemsComp) buyTicket(session comm.IUserSession, buy int32) (inf
|
||||
if code = this.module.ConsumeRes(session, needs, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
atn := this.module.configure.GetGlobalConf().CopsBuyGet
|
||||
|
||||
res := &cfg.Gameatn{
|
||||
A: atn.A,
|
||||
T: atn.T,
|
||||
N: atn.N * buy,
|
||||
}
|
||||
info.Buyunifiedticket += buy
|
||||
if code = this.module.DispenseRes(session, []*cfg.Gameatn{{A: comm.ItemType, T: comm.UnifiedTicket, N: buy}}, true); code != pb.ErrorCode_Success {
|
||||
if code = this.module.DispenseRes(session, []*cfg.Gameatn{res}, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
|
||||
|
||||
@ -57,9 +57,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
|
||||
stove.Data[req.ReelId].Value += 1
|
||||
// 是否是精益打造
|
||||
if req.Quality > 0 {
|
||||
costRes = append(costRes, reelcfg.Quality)
|
||||
costRes = append(costRes, reelcfg.RefineCos)
|
||||
}
|
||||
costRes = append(costRes, reelcfg.Consume...)
|
||||
costRes = append(costRes, reelcfg.BasicCos...)
|
||||
subAtn := this.module.modelStove.CheckForgeConsume(req.ReelId, stove.Data[req.ReelId].Lv)
|
||||
costRes = append(costRes, subAtn...)
|
||||
if code = this.module.CheckRes(session, costRes); code != pb.ErrorCode_Success {
|
||||
@ -68,7 +68,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
|
||||
// 熟练度减少的温度
|
||||
t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv)
|
||||
// 检查炉温 是否够
|
||||
if stove.Temperature < reelcfg.Temperature-t {
|
||||
if stove.Temperature < reelcfg.TemperatureCos-t {
|
||||
code = pb.ErrorCode_SmithyNoTemperature // 炉温不够 直接返回
|
||||
return
|
||||
}
|
||||
@ -89,7 +89,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
|
||||
if code = this.module.ConsumeRes(session, costRes, true); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
stove.Temperature -= (reelcfg.Temperature - t) // 消耗温度
|
||||
stove.Temperature -= (reelcfg.TemperatureCos - t) // 消耗温度
|
||||
stove.RecoveTime = configure.Now().Unix()
|
||||
update["data"] = stove.Data
|
||||
update["recoveTime"] = stove.RecoveTime
|
||||
|
||||
@ -9,6 +9,9 @@ import (
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
// 3个顾客
|
||||
var customerCount int32 = 3
|
||||
|
||||
func (this *apiComp) CustomerCheck(session comm.IUserSession, req *pb.SmithyCustomerReq) (code pb.ErrorCode) {
|
||||
return
|
||||
}
|
||||
@ -17,7 +20,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR
|
||||
cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId())
|
||||
if err != nil {
|
||||
if err == mongo.ErrNoDocuments {
|
||||
c, err := this.module.modelTrade.addCustomer(session.GetUserId(), 3)
|
||||
c, err := this.module.modelTrade.addCustomer(session.GetUserId(), customerCount) //3个顾客
|
||||
if err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
@ -31,7 +34,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR
|
||||
|
||||
if utils.IsFirstTody(cus.LastRefreshTime) {
|
||||
this.module.modelTrade.DelByUId(session.GetUserId())
|
||||
c, err := this.module.modelTrade.addCustomer(session.GetUserId(), 3)
|
||||
c, err := this.module.modelTrade.addCustomer(session.GetUserId(), customerCount)
|
||||
if err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
return
|
||||
@ -40,7 +43,7 @@ func (this *apiComp) Customer(session comm.IUserSession, req *pb.SmithyCustomerR
|
||||
}
|
||||
|
||||
rsp := &pb.SmithyCustomerResp{
|
||||
CustomerIds: cus.CustomerIds,
|
||||
Customers: cus.Customers,
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "customer", rsp)
|
||||
|
||||
@ -4,19 +4,19 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
|
||||
"github.com/golang/protobuf/proto"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
// 贸易
|
||||
|
||||
func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode) {
|
||||
if req.CustomerId == 0 || len(req.Ids) == 0 {
|
||||
if req.CustomerId == 0 || len(req.EquipIds) == 0 {
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) SellItem(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data proto.Message) {
|
||||
func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (code pb.ErrorCode, data proto.Message) {
|
||||
if code = this.SellCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
@ -24,6 +24,19 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.SmithySellReq)
|
||||
//校验customer类型，因为有的类型是不能进入交易逻辑的
|
||||
//TODO
|
||||
|
||||
// cus, err := this.module.modelTrade.getDBCustomer(session.GetUserId())
|
||||
// if err != nil {
|
||||
// code = pb.ErrorCode_DBError
|
||||
// return
|
||||
// }
|
||||
|
||||
|
||||
if imodule, err := this.service.GetModule(comm.ModuleEquipment); err == nil {
|
||||
if iequip, ok := imodule.(comm.IEquipment); ok {
|
||||
iequip.RecycleEquipments(session, req.EquipIds, this.module.modelStove.StoveToolsSellUp(session.GetUserId()))
|
||||
}
|
||||
}
|
||||
|
||||
_ = this.module.modelTrade.updateCustomer(session.GetUserId(), req.CustomerId)
|
||||
|
||||
conf := this.module.configure.GetSmithyCustomerConf(req.CustomerId)
|
||||
@ -37,7 +50,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.SmithySellReq)
|
||||
|
||||
rsp := &pb.SmithySellResp{
|
||||
CustomerId: req.CustomerId,
|
||||
Ids: req.Ids,
|
||||
EquipIds: req.EquipIds,
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "sell", rsp)
|
||||
|
||||
@ -55,12 +55,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
configure.RegisterConfigure(game_smproficiency, cfg.NewGameSmithyProficiency, this.LoadProficileData)
|
||||
this._mapskill = make(map[int64]*cfg.GameSmithyToolData, 0)
|
||||
configure.RegisterConfigure(game_smithytools, cfg.NewGameSmithyTool, this.LoadSmithySkillData)
|
||||
err = this.LoadConfigure(game_smithyreel, cfg.NewGameSmithyStove)
|
||||
err = this.LoadConfigure(game_smithyreel, cfg.NewGameNewSmithy)
|
||||
err = this.LoadConfigure(game_smithystove, cfg.NewGameSmithyStoveV1)
|
||||
err = this.LoadConfigure(game_smithytools, cfg.NewGameSmithyTool)
|
||||
err = this.LoadConfigure(game_smithystoveold, cfg.NewGameSmithyStove)
|
||||
err = this.LoadConfigure(game_smithycustomer, cfg.NewGameSmithyCustomer)
|
||||
|
||||
_d := this.GetSmithProficiencyConf(1)
|
||||
this.module.Errorf("%v", _d)
|
||||
return
|
||||
}
|
||||
|
||||
@ -196,7 +198,7 @@ func (this *configureComp) GetSmithyProficileData(reelid int32, proficile int32)
|
||||
|
||||
// 获取铁匠铺顾客配置
|
||||
func (this *configureComp) GetSmithyCustomerConfList() (data []*cfg.GameSmithyCustomerData) {
|
||||
if v, err := this.GetConfigure(game_smithycustomer); err != nil {
|
||||
if v, err := this.GetConfigure(game_smithycustomer); err == nil {
|
||||
if conf, ok := v.(*cfg.GameSmithyCustomer); ok {
|
||||
data = conf.GetDataList()
|
||||
return
|
||||
|
||||
@ -8,7 +8,9 @@ import (
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"math/rand"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
@ -66,15 +68,38 @@ func (this *modelStove) updateSmithyStove(uid string, update map[string]interfac
|
||||
func (this *modelStove) CheckTemperature(reelId int32, lv int32) (t int32) {
|
||||
var index int32
|
||||
for index = 1; index <= lv; index++ {
|
||||
if cfg := this.module.configure.GetSmithyProficileData(reelId, index); cfg != nil {
|
||||
if cfg.Type == comm.SmithyReelType1 {
|
||||
t += cfg.Value1
|
||||
if cfgData := this.module.configure.GetSmithyProficileData(reelId, index); cfgData != nil {
|
||||
if cfgData.Type == comm.SmithyReelType1 {
|
||||
t += cfgData.Value1
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 检查额外概率制造两件装备
|
||||
func (this *modelStove) CheckForgetwoEquip(reelId int32, lv int32) (b bool) {
|
||||
var (
|
||||
index int32
|
||||
value int32
|
||||
)
|
||||
for index = 1; index <= lv; index++ {
|
||||
if cfgData := this.module.configure.GetSmithyProficileData(reelId, index); cfgData != nil {
|
||||
if cfgData.Type == comm.SmithyReelType5 {
|
||||
value += cfgData.Value1
|
||||
}
|
||||
}
|
||||
}
|
||||
if value > 0 {
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
if value < int32(rand.Intn(100)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// 检查消耗减少
|
||||
func (this *modelStove) CheckForgeConsume(reelId int32, lv int32) (atn []*cfg.Gameatn) {
|
||||
var index int32
|
||||
@ -115,3 +140,75 @@ func (this *modelStove) calculationRecoveryT(uid string, stove *pb.DBStove) {
|
||||
this.module.modelStove.updateSmithyStove(uid, update)
|
||||
}
|
||||
}
|
||||
|
||||
// 通过技能获取额外的提升
|
||||
func (this *modelStove) StoveToolsQualityProbability(stove *pb.DBStove) int32 {
|
||||
if v, ok := stove.Skill[comm.SmithyToolsSkill1]; ok {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil {
|
||||
return conf.Value
|
||||
} else {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 所有装备售价提升{0}%
|
||||
func (this *modelStove) StoveToolsSellUp(uid string) int32 {
|
||||
if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil {
|
||||
if v, ok := stove.Skill[comm.SmithyToolsSkill2]; ok {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil {
|
||||
return conf.Value
|
||||
} else {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 所有图纸炉温消耗减少
|
||||
func (this *modelStove) StoveToolsTemperature(stove *pb.DBStove) int32 {
|
||||
if v, ok := stove.Skill[comm.SmithyToolsSkill3]; ok {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil {
|
||||
return conf.Value
|
||||
} else {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//每日顾客数量提升至{0}人
|
||||
func (this *modelStove) StoveSkillAddCustomer(uid string) int32 {
|
||||
if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil {
|
||||
if v, ok := stove.Skill[comm.SmithyToolsSkill4]; ok {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
} else {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, 0); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
//顾客购买装备数量上限提高至{0}件
|
||||
func (this *modelStove) StoveSkillBuyEquip(uid string) int32 {
|
||||
if stove, err := this.module.modelStove.getSmithyStoveList(uid); err == nil {
|
||||
if v, ok := stove.Skill[comm.SmithyToolsSkill5]; ok {
|
||||
if conf := this.module.configure.GetSmithySkill(comm.SmithyToolsSkill1, v); conf != nil {
|
||||
return conf.Value
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@ import (
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"math/rand"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
@ -30,13 +29,18 @@ func (this *modelTrade) Init(service core.IService, module core.IModule, comp co
|
||||
return
|
||||
}
|
||||
|
||||
type WeightItem struct {
|
||||
Id interface{}
|
||||
Weight int
|
||||
}
|
||||
|
||||
// 权重项目
|
||||
type WeightedRandom struct {
|
||||
items []*cfg.GameSmithyCustomerData
|
||||
items []*WeightItem
|
||||
totalWeight int
|
||||
}
|
||||
|
||||
func newWeightedRandom(items []*cfg.GameSmithyCustomerData) *WeightedRandom {
|
||||
func newWeightedRandom(items []*WeightItem) *WeightedRandom {
|
||||
wr := &WeightedRandom{items: items}
|
||||
for _, item := range wr.items {
|
||||
wr.totalWeight += int(item.Weight)
|
||||
@ -44,7 +48,10 @@ func newWeightedRandom(items []*cfg.GameSmithyCustomerData) *WeightedRandom {
|
||||
return wr
|
||||
}
|
||||
|
||||
func (wr *WeightedRandom) pick() *cfg.GameSmithyCustomerData {
|
||||
func (wr *WeightedRandom) pick() *WeightItem {
|
||||
if wr.totalWeight <= 0 {
|
||||
return nil
|
||||
}
|
||||
randomNumber := rand.Intn(wr.totalWeight)
|
||||
for _, item := range wr.items {
|
||||
if randomNumber < int(item.Weight) {
|
||||
@ -57,10 +64,14 @@ func (wr *WeightedRandom) pick() *cfg.GameSmithyCustomerData {
|
||||
|
||||
// 随机顾客
|
||||
func (s *modelTrade) getCustomerRandom() (customerId int32) {
|
||||
items := s.module.configure.GetSmithyCustomerConfList()
|
||||
confList := s.module.configure.GetSmithyCustomerConfList()
|
||||
var items []*WeightItem
|
||||
for _, v := range confList {
|
||||
items = append(items, &WeightItem{Id: v.CustomerId, Weight: int(v.Weight)})
|
||||
}
|
||||
wr := newWeightedRandom(items)
|
||||
if c := wr.pick(); c != nil {
|
||||
customerId = c.CustomerId
|
||||
customerId = (c.Id).(int32)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -68,7 +79,6 @@ func (s *modelTrade) getCustomerRandom() (customerId int32) {
|
||||
func (s *modelTrade) getDBCustomer(uid string) (*pb.DBCustomer, error) {
|
||||
customer := &pb.DBCustomer{}
|
||||
if err := s.Get(uid, customer); err != nil {
|
||||
s.module.Errorln(err)
|
||||
return nil, err
|
||||
}
|
||||
return customer, nil
|
||||
@ -83,7 +93,11 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error)
|
||||
LastRefreshTime: configure.Now().Unix(),
|
||||
}
|
||||
for i := 0; i < int(num); i++ {
|
||||
customer.CustomerIds = append(customer.CustomerIds, s.getCustomerRandom())
|
||||
customer.Customers = append(customer.Customers, &pb.CustomerInfo{
|
||||
CustomerId: s.getCustomerRandom(),
|
||||
SuitId: s.GetSuitRandom(uid),
|
||||
EquipCount: s.module.modelStove.StoveSkillBuyEquip(uid),
|
||||
})
|
||||
}
|
||||
if err := s.Add(uid, customer); err != nil {
|
||||
s.module.Errorln(err)
|
||||
@ -94,9 +108,9 @@ func (s *modelTrade) addCustomer(uid string, num int32) (*pb.DBCustomer, error)
|
||||
|
||||
// 移除顾客
|
||||
func (s *modelTrade) removeCustomer(cus *pb.DBCustomer, customerId int32) *pb.DBCustomer {
|
||||
for i, v := range cus.CustomerIds {
|
||||
if v == customerId {
|
||||
cus.CustomerIds = append(cus.CustomerIds[:i], cus.CustomerIds[i+1:]...)
|
||||
for i, v := range cus.Customers {
|
||||
if v.CustomerId == customerId {
|
||||
cus.Customers = append(cus.Customers[:i], cus.Customers[i+1:]...)
|
||||
i--
|
||||
}
|
||||
}
|
||||
@ -116,10 +130,14 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error {
|
||||
return comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit)
|
||||
}
|
||||
|
||||
cus.CustomerIds = append(cus.CustomerIds, s.getCustomerRandom())
|
||||
cus.Customers = append(cus.Customers, &pb.CustomerInfo{
|
||||
CustomerId: s.getCustomerRandom(),
|
||||
SuitId: s.GetSuitRandom(uid),
|
||||
EquipCount: s.module.modelStove.StoveSkillBuyEquip(uid),
|
||||
})
|
||||
cus.LastRefreshTime = configure.Now().Unix()
|
||||
update := map[string]interface{}{
|
||||
"customerIds": cus.CustomerIds,
|
||||
"customerIds": cus.Customers,
|
||||
"total": cus.Total,
|
||||
"lastRefreshTime": cus.LastRefreshTime,
|
||||
}
|
||||
@ -130,6 +148,52 @@ func (s *modelTrade) updateCustomer(uid string, customerId int32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
//顾客类型策略
|
||||
// 返回概率下的套装
|
||||
func (s *modelTrade) GetSuitRandom(uid string) string {
|
||||
//获取玩家所有解锁套装
|
||||
unlockEquips := []*pb.DB_Equipment{}
|
||||
var unlockEquipsItems []*WeightItem
|
||||
for _, v := range unlockEquips {
|
||||
unlockEquipsItems = append(unlockEquipsItems, &WeightItem{
|
||||
Id: v.Id,
|
||||
Weight: 5,
|
||||
})
|
||||
}
|
||||
//获取玩家已有装备
|
||||
ownerEquips := []*pb.DB_Equipment{}
|
||||
var ownerEquipsItems []*WeightItem
|
||||
for _, v := range ownerEquips {
|
||||
ownerEquipsItems = append(ownerEquipsItems, &WeightItem{
|
||||
Id: v.Id,
|
||||
Weight: 7,
|
||||
})
|
||||
}
|
||||
|
||||
merge := append(unlockEquipsItems, ownerEquipsItems...)
|
||||
// 设置权重
|
||||
wr := newWeightedRandom(merge)
|
||||
if c := wr.pick(); c != nil {
|
||||
return c.Id.(string)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// 交易
|
||||
func (s *modelTrade) trade(uid string, customerId int32) error {
|
||||
cus, err := s.getDBCustomer(uid)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i, v := range cus.Customers {
|
||||
if v.CustomerId == customerId {
|
||||
if v.EquipCount <= 0 {
|
||||
return comm.NewCustomError(pb.ErrorCode_SmithyCustomerEquipNoEnough)
|
||||
}
|
||||
cus.Customers = append(cus.Customers[:i], cus.Customers[i+1:]...)
|
||||
i--
|
||||
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -320,6 +320,7 @@ const (
|
||||
ErrorCode_SmithyNoTemperature ErrorCode = 4102 // 炉温不够不能打造
|
||||
ErrorCode_SmithyStoveMaxLv ErrorCode = 4103 // 炉子达到最大等级
|
||||
ErrorCode_SmithyCustomerLimit ErrorCode = 4104 //顾客上限
|
||||
ErrorCode_SmithyCustomerEquipNoEnough ErrorCode = 4105 //装备回收数量不足
|
||||
)
|
||||
|
||||
// Enum value maps for ErrorCode.
|
||||
@ -590,6 +591,7 @@ var (
|
||||
4102: "SmithyNoTemperature",
|
||||
4103: "SmithyStoveMaxLv",
|
||||
4104: "SmithyCustomerLimit",
|
||||
4105: "SmithyCustomerEquipNoEnough",
|
||||
}
|
||||
ErrorCode_value = map[string]int32{
|
||||
"Success": 0,
|
||||
@ -857,6 +859,7 @@ var (
|
||||
"SmithyNoTemperature": 4102,
|
||||
"SmithyStoveMaxLv": 4103,
|
||||
"SmithyCustomerLimit": 4104,
|
||||
"SmithyCustomerEquipNoEnough": 4105,
|
||||
}
|
||||
)
|
||||
|
||||
@ -891,7 +894,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_errorcode_proto_rawDesc = []byte{
|
||||
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x2a, 0xf0, 0x2f, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x6f, 0x2a, 0x92, 0x30, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
|
||||
0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12,
|
||||
0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
|
||||
@ -1274,8 +1277,10 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x10, 0x86, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f,
|
||||
0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
|
||||
0x74, 0x10, 0x88, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x74, 0x10, 0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75,
|
||||
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f,
|
||||
0x75, 0x67, 0x68, 0x10, 0x89, 0x20, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -179,6 +179,69 @@ func (x *DBStove) GetRecoveTime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
type CustomerInfo struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID
|
||||
SuitId string `protobuf:"bytes,2,opt,name=suitId,proto3" json:"suitId"` //套装ID 随机套装
|
||||
EquipCount int32 `protobuf:"varint,3,opt,name=equipCount,proto3" json:"equipCount"` //装备数量
|
||||
}
|
||||
|
||||
func (x *CustomerInfo) Reset() {
|
||||
*x = CustomerInfo{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *CustomerInfo) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*CustomerInfo) ProtoMessage() {}
|
||||
|
||||
func (x *CustomerInfo) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_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 CustomerInfo.ProtoReflect.Descriptor instead.
|
||||
func (*CustomerInfo) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *CustomerInfo) GetCustomerId() int32 {
|
||||
if x != nil {
|
||||
return x.CustomerId
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *CustomerInfo) GetSuitId() string {
|
||||
if x != nil {
|
||||
return x.SuitId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *CustomerInfo) GetEquipCount() int32 {
|
||||
if x != nil {
|
||||
return x.EquipCount
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type DBCustomer struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -186,7 +249,7 @@ type DBCustomer struct {
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //
|
||||
CustomerIds []int32 `protobuf:"varint,3,rep,packed,name=customerIds,proto3" json:"customerIds" bson:"customerIds"` // 顾客Ids
|
||||
Customers []*CustomerInfo `protobuf:"bytes,3,rep,name=customers,proto3" json:"customers" bson:"customers"` // 顾客信息
|
||||
Total int32 `protobuf:"varint,4,opt,name=total,proto3" json:"total" bson:"total"` //顾客累计数
|
||||
LastRefreshTime int64 `protobuf:"varint,5,opt,name=lastRefreshTime,proto3" json:"lastRefreshTime" bson:"lastRefreshTime"` // 上次更新时间
|
||||
}
|
||||
@ -194,7 +257,7 @@ type DBCustomer struct {
|
||||
func (x *DBCustomer) Reset() {
|
||||
*x = DBCustomer{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[2]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -207,7 +270,7 @@ func (x *DBCustomer) String() string {
|
||||
func (*DBCustomer) ProtoMessage() {}
|
||||
|
||||
func (x *DBCustomer) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[2]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[3]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -220,7 +283,7 @@ func (x *DBCustomer) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBCustomer.ProtoReflect.Descriptor instead.
|
||||
func (*DBCustomer) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{2}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *DBCustomer) GetId() string {
|
||||
@ -237,9 +300,9 @@ func (x *DBCustomer) GetUid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBCustomer) GetCustomerIds() []int32 {
|
||||
func (x *DBCustomer) GetCustomers() []*CustomerInfo {
|
||||
if x != nil {
|
||||
return x.CustomerIds
|
||||
return x.Customers
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -273,7 +336,7 @@ type DBTujian struct {
|
||||
func (x *DBTujian) Reset() {
|
||||
*x = DBTujian{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[3]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -286,7 +349,7 @@ func (x *DBTujian) String() string {
|
||||
func (*DBTujian) ProtoMessage() {}
|
||||
|
||||
func (x *DBTujian) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[3]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[4]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -299,7 +362,7 @@ func (x *DBTujian) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBTujian.ProtoReflect.Descriptor instead.
|
||||
func (*DBTujian) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{3}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *DBTujian) GetId() string {
|
||||
@ -343,7 +406,7 @@ type ForgeData struct {
|
||||
func (x *ForgeData) Reset() {
|
||||
*x = ForgeData{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[4]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -356,7 +419,7 @@ func (x *ForgeData) String() string {
|
||||
func (*ForgeData) ProtoMessage() {}
|
||||
|
||||
func (x *ForgeData) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[4]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[5]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -369,7 +432,7 @@ func (x *ForgeData) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use ForgeData.ProtoReflect.Descriptor instead.
|
||||
func (*ForgeData) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{4}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *ForgeData) GetForgeCount() int32 {
|
||||
@ -407,7 +470,7 @@ type Clang struct {
|
||||
func (x *Clang) Reset() {
|
||||
*x = Clang{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[5]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -420,7 +483,7 @@ func (x *Clang) String() string {
|
||||
func (*Clang) ProtoMessage() {}
|
||||
|
||||
func (x *Clang) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[5]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -433,7 +496,7 @@ func (x *Clang) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use Clang.ProtoReflect.Descriptor instead.
|
||||
func (*Clang) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{5}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *Clang) GetDeskType() int32 {
|
||||
@ -470,7 +533,7 @@ type OrderClang struct {
|
||||
func (x *OrderClang) Reset() {
|
||||
*x = OrderClang{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -483,7 +546,7 @@ func (x *OrderClang) String() string {
|
||||
func (*OrderClang) ProtoMessage() {}
|
||||
|
||||
func (x *OrderClang) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[6]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -496,7 +559,7 @@ func (x *OrderClang) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use OrderClang.ProtoReflect.Descriptor instead.
|
||||
func (*OrderClang) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{6}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *OrderClang) GetDeskType() int32 {
|
||||
@ -542,7 +605,7 @@ type DBSmithy struct {
|
||||
func (x *DBSmithy) Reset() {
|
||||
*x = DBSmithy{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -555,7 +618,7 @@ func (x *DBSmithy) String() string {
|
||||
func (*DBSmithy) ProtoMessage() {}
|
||||
|
||||
func (x *DBSmithy) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[7]
|
||||
mi := &file_smithy_smithy_db_proto_msgTypes[8]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -568,7 +631,7 @@ func (x *DBSmithy) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBSmithy.ProtoReflect.Descriptor instead.
|
||||
func (*DBSmithy) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{7}
|
||||
return file_smithy_smithy_db_proto_rawDescGZIP(), []int{8}
|
||||
}
|
||||
|
||||
func (x *DBSmithy) GetId() string {
|
||||
@ -690,78 +753,85 @@ var file_smithy_smithy_db_proto_rawDesc = []byte{
|
||||
0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x01, 0x0a, 0x0a, 0x44,
|
||||
0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 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, 0x20, 0x0a, 0x0b, 0x63,
|
||||
0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05,
|
||||
0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f,
|
||||
0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65,
|
||||
0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61,
|
||||
0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xba, 0x01,
|
||||
0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x2d, 0x0a, 0x06,
|
||||
0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44,
|
||||
0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x73,
|
||||
0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x6c, 0x69,
|
||||
0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x09, 0x46, 0x6f,
|
||||
0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x67, 0x65,
|
||||
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x66, 0x6f, 0x72,
|
||||
0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69,
|
||||
0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74,
|
||||
0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65,
|
||||
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65,
|
||||
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x82,
|
||||
0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a,
|
||||
0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x43,
|
||||
0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x06, 0x6f,
|
||||
0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x4f, 0x72,
|
||||
0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73,
|
||||
0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74,
|
||||
0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x53, 0x6b,
|
||||
0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12,
|
||||
0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
|
||||
0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f,
|
||||
0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69,
|
||||
0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1e, 0x0a,
|
||||
0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x1c, 0x0a,
|
||||
0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x53,
|
||||
0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f,
|
||||
0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||
0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x66, 0x0a, 0x0c, 0x43, 0x75,
|
||||
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75,
|
||||
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75,
|
||||
0x69, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x69, 0x74,
|
||||
0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x43, 0x6f, 0x75,
|
||||
0x6e, 0x74, 0x22, 0x9b, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
|
||||
0x72, 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, 0x2b, 0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73,
|
||||
0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
|
||||
0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65,
|
||||
0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x0f, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65,
|
||||
0x22, 0xba, 0x01, 0x0a, 0x08, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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,
|
||||
0x2d, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x15, 0x2e, 0x44, 0x42, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61,
|
||||
0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
|
||||
0x73, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x1a, 0x45, 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61,
|
||||
0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a,
|
||||
0x09, 0x46, 0x6f, 0x72, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f,
|
||||
0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x66, 0x6f, 0x72, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x71, 0x75,
|
||||
0x61, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x71, 0x75, 0x61,
|
||||
0x6c, 0x69, 0x74, 0x79, 0x22, 0x4f, 0x0a, 0x05, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
|
||||
0x73, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x0a, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c,
|
||||
0x61, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
|
||||
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x65, 0x64, 0x54, 0x69, 0x6d,
|
||||
0x65, 0x22, 0x82, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 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, 0x1c, 0x0a, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x06, 0x2e, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x63, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x23,
|
||||
0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x06, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52,
|
||||
0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
|
||||
0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
|
||||
0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69,
|
||||
0x6c, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x18, 0x07, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x4c, 0x76, 0x12, 0x24, 0x0a, 0x0d,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x0d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
|
||||
0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x64, 0x65, 0x73, 0x6b,
|
||||
0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42,
|
||||
0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x2e, 0x44, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x64, 0x65, 0x73, 0x6b, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
|
||||
0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x18, 0x0b,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x6f, 0x76, 0x65, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x38,
|
||||
0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x44, 0x65, 0x73, 0x6b,
|
||||
0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -776,41 +846,43 @@ func file_smithy_smithy_db_proto_rawDescGZIP() []byte {
|
||||
return file_smithy_smithy_db_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
|
||||
var file_smithy_smithy_db_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
|
||||
var file_smithy_smithy_db_proto_goTypes = []interface{}{
|
||||
(*Mastery)(nil), // 0: Mastery
|
||||
(*DBStove)(nil), // 1: DBStove
|
||||
(*DBCustomer)(nil), // 2: DBCustomer
|
||||
(*DBTujian)(nil), // 3: DBTujian
|
||||
(*ForgeData)(nil), // 4: ForgeData
|
||||
(*Clang)(nil), // 5: Clang
|
||||
(*OrderClang)(nil), // 6: OrderClang
|
||||
(*DBSmithy)(nil), // 7: DBSmithy
|
||||
nil, // 8: DBStove.DataEntry
|
||||
nil, // 9: DBStove.SkillEntry
|
||||
nil, // 10: DBStove.ForgeEntry
|
||||
nil, // 11: DBTujian.TujianEntry
|
||||
nil, // 12: DBSmithy.SkillEntry
|
||||
nil, // 13: DBSmithy.DeskFloorEntry
|
||||
(*UserAssets)(nil), // 14: UserAssets
|
||||
(*CustomerInfo)(nil), // 2: CustomerInfo
|
||||
(*DBCustomer)(nil), // 3: DBCustomer
|
||||
(*DBTujian)(nil), // 4: DBTujian
|
||||
(*ForgeData)(nil), // 5: ForgeData
|
||||
(*Clang)(nil), // 6: Clang
|
||||
(*OrderClang)(nil), // 7: OrderClang
|
||||
(*DBSmithy)(nil), // 8: DBSmithy
|
||||
nil, // 9: DBStove.DataEntry
|
||||
nil, // 10: DBStove.SkillEntry
|
||||
nil, // 11: DBStove.ForgeEntry
|
||||
nil, // 12: DBTujian.TujianEntry
|
||||
nil, // 13: DBSmithy.SkillEntry
|
||||
nil, // 14: DBSmithy.DeskFloorEntry
|
||||
(*UserAssets)(nil), // 15: UserAssets
|
||||
}
|
||||
var file_smithy_smithy_db_proto_depIdxs = []int32{
|
||||
8, // 0: DBStove.data:type_name -> DBStove.DataEntry
|
||||
9, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
|
||||
10, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
|
||||
11, // 3: DBTujian.tujian:type_name -> DBTujian.TujianEntry
|
||||
5, // 4: DBSmithy.clang:type_name -> Clang
|
||||
6, // 5: DBSmithy.orders:type_name -> OrderClang
|
||||
14, // 6: DBSmithy.items:type_name -> UserAssets
|
||||
12, // 7: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
|
||||
13, // 8: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
|
||||
0, // 9: DBStove.DataEntry.value:type_name -> Mastery
|
||||
4, // 10: DBTujian.TujianEntry.value:type_name -> ForgeData
|
||||
11, // [11:11] is the sub-list for method output_type
|
||||
11, // [11:11] is the sub-list for method input_type
|
||||
11, // [11:11] is the sub-list for extension type_name
|
||||
11, // [11:11] is the sub-list for extension extendee
|
||||
0, // [0:11] is the sub-list for field type_name
|
||||
9, // 0: DBStove.data:type_name -> DBStove.DataEntry
|
||||
10, // 1: DBStove.skill:type_name -> DBStove.SkillEntry
|
||||
11, // 2: DBStove.forge:type_name -> DBStove.ForgeEntry
|
||||
2, // 3: DBCustomer.customers:type_name -> CustomerInfo
|
||||
12, // 4: DBTujian.tujian:type_name -> DBTujian.TujianEntry
|
||||
6, // 5: DBSmithy.clang:type_name -> Clang
|
||||
7, // 6: DBSmithy.orders:type_name -> OrderClang
|
||||
15, // 7: DBSmithy.items:type_name -> UserAssets
|
||||
13, // 8: DBSmithy.skill:type_name -> DBSmithy.SkillEntry
|
||||
14, // 9: DBSmithy.deskFloor:type_name -> DBSmithy.DeskFloorEntry
|
||||
0, // 10: DBStove.DataEntry.value:type_name -> Mastery
|
||||
5, // 11: DBTujian.TujianEntry.value:type_name -> ForgeData
|
||||
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_smithy_smithy_db_proto_init() }
|
||||
@ -845,7 +917,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBCustomer); i {
|
||||
switch v := v.(*CustomerInfo); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -857,7 +929,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBTujian); i {
|
||||
switch v := v.(*DBCustomer); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -869,7 +941,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*ForgeData); i {
|
||||
switch v := v.(*DBTujian); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -881,7 +953,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*Clang); i {
|
||||
switch v := v.(*ForgeData); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -893,7 +965,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*OrderClang); i {
|
||||
switch v := v.(*Clang); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -905,6 +977,18 @@ func file_smithy_smithy_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*OrderClang); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_smithy_smithy_db_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBSmithy); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -923,7 +1007,7 @@ func file_smithy_smithy_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_smithy_smithy_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 14,
|
||||
NumMessages: 15,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -636,7 +636,7 @@ func (x *SmithyToolsUpResp) GetData() *DBStove {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 刷新商人
|
||||
// 顾客
|
||||
type SmithyCustomerReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -680,7 +680,7 @@ type SmithyCustomerResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
CustomerIds []int32 `protobuf:"varint,1,rep,packed,name=customerIds,proto3" json:"customerIds"` //顾客
|
||||
Customers []*CustomerInfo `protobuf:"bytes,1,rep,name=customers,proto3" json:"customers"` //顾客及装备信息
|
||||
}
|
||||
|
||||
func (x *SmithyCustomerResp) Reset() {
|
||||
@ -715,9 +715,9 @@ func (*SmithyCustomerResp) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{13}
|
||||
}
|
||||
|
||||
func (x *SmithyCustomerResp) GetCustomerIds() []int32 {
|
||||
func (x *SmithyCustomerResp) GetCustomers() []*CustomerInfo {
|
||||
if x != nil {
|
||||
return x.CustomerIds
|
||||
return x.Customers
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -728,7 +728,7 @@ type SmithySellReq struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Ids []int32 `protobuf:"varint,1,rep,packed,name=ids,proto3" json:"ids"` // 装备ID
|
||||
EquipIds []string `protobuf:"bytes,1,rep,name=equipIds,proto3" json:"equipIds"` // 装备ID
|
||||
CustomerId int32 `protobuf:"varint,2,opt,name=customerId,proto3" json:"customerId"` //顾客ID
|
||||
}
|
||||
|
||||
@ -764,9 +764,9 @@ func (*SmithySellReq) Descriptor() ([]byte, []int) {
|
||||
return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{14}
|
||||
}
|
||||
|
||||
func (x *SmithySellReq) GetIds() []int32 {
|
||||
func (x *SmithySellReq) GetEquipIds() []string {
|
||||
if x != nil {
|
||||
return x.Ids
|
||||
return x.EquipIds
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -784,7 +784,7 @@ type SmithySellResp struct {
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
CustomerId int32 `protobuf:"varint,1,opt,name=customerId,proto3" json:"customerId"` //顾客ID
|
||||
Ids []int32 `protobuf:"varint,2,rep,packed,name=ids,proto3" json:"ids"` //出售的装备
|
||||
EquipIds []string `protobuf:"bytes,2,rep,name=equipIds,proto3" json:"equipIds"` //出售的装备
|
||||
}
|
||||
|
||||
func (x *SmithySellResp) Reset() {
|
||||
@ -826,9 +826,9 @@ func (x *SmithySellResp) GetCustomerId() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *SmithySellResp) GetIds() []int32 {
|
||||
func (x *SmithySellResp) GetEquipIds() []string {
|
||||
if x != nil {
|
||||
return x.Ids
|
||||
return x.EquipIds
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -1429,55 +1429,57 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{
|
||||
0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x52, 0x04, 0x64,
|
||||
0x61, 0x74, 0x61, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73,
|
||||
0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74,
|
||||
0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20,
|
||||
0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x05, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x73,
|
||||
0x22, 0x41, 0x0a, 0x0d, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65,
|
||||
0x71, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03,
|
||||
0x69, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
|
||||
0x72, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c,
|
||||
0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65,
|
||||
0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f,
|
||||
0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x05, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68,
|
||||
0x79, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12,
|
||||
0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61,
|
||||
0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64,
|
||||
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71,
|
||||
0x22, 0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77,
|
||||
0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
|
||||
0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
|
||||
0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a,
|
||||
0x0a, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61,
|
||||
0x74, 0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76,
|
||||
0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53,
|
||||
0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c,
|
||||
0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65,
|
||||
0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
|
||||
0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65,
|
||||
0x6f, 0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65,
|
||||
0x74, 0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a,
|
||||
0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
|
||||
0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32,
|
||||
0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61,
|
||||
0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74,
|
||||
0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2b,
|
||||
0x0a, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
|
||||
0x52, 0x09, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x53,
|
||||
0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
|
||||
0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08,
|
||||
0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74,
|
||||
0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x75,
|
||||
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74,
|
||||
0x68, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75,
|
||||
0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x71,
|
||||
0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x71,
|
||||
0x75, 0x69, 0x70, 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
|
||||
0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x21,
|
||||
0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||
0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x61, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65,
|
||||
0x72, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x72, 0x65, 0x61, 0x74,
|
||||
0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
|
||||
0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69,
|
||||
0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x14, 0x0a, 0x12, 0x53, 0x6d, 0x69,
|
||||
0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
|
||||
0x34, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52,
|
||||
0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x32, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x44,
|
||||
0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x08, 0x64, 0x65, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0x36, 0x0a, 0x15, 0x53, 0x6d, 0x69,
|
||||
0x74, 0x68, 0x79, 0x44, 0x65, 0x73, 0x6b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x22, 0x17, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65,
|
||||
0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x6d,
|
||||
0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64,
|
||||
0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
|
||||
0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70,
|
||||
0x65, 0x6f, 0x70, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x65, 0x6f,
|
||||
0x70, 0x6c, 0x65, 0x22, 0x34, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74,
|
||||
0x52, 0x61, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04,
|
||||
0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55,
|
||||
0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x6d, 0x69,
|
||||
0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a,
|
||||
0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1523,9 +1525,10 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{
|
||||
(*SmithyGetListReq)(nil), // 26: SmithyGetListReq
|
||||
(*SmithyGetListResp)(nil), // 27: SmithyGetListResp
|
||||
(*DBStove)(nil), // 28: DBStove
|
||||
(*OrderClang)(nil), // 29: OrderClang
|
||||
(*DBSmithy)(nil), // 30: DBSmithy
|
||||
(*DBUser)(nil), // 31: DBUser
|
||||
(*CustomerInfo)(nil), // 29: CustomerInfo
|
||||
(*OrderClang)(nil), // 30: OrderClang
|
||||
(*DBSmithy)(nil), // 31: DBSmithy
|
||||
(*DBUser)(nil), // 32: DBUser
|
||||
}
|
||||
var file_smithy_smithy_msg_proto_depIdxs = []int32{
|
||||
28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove
|
||||
@ -1534,18 +1537,19 @@ var file_smithy_smithy_msg_proto_depIdxs = []int32{
|
||||
28, // 3: SmithyStoveUpResp.data:type_name -> DBStove
|
||||
28, // 4: SmithyRiseResp.data:type_name -> DBStove
|
||||
28, // 5: SmithyToolsUpResp.data:type_name -> DBStove
|
||||
29, // 6: SmithyCreateOrderReq.order:type_name -> OrderClang
|
||||
30, // 7: SmithyCreateOrderResp.data:type_name -> DBSmithy
|
||||
30, // 8: SmithyGetRewardResp.data:type_name -> DBSmithy
|
||||
30, // 9: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
|
||||
30, // 10: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
|
||||
31, // 11: SmithyGetRandUserResp.user:type_name -> DBUser
|
||||
30, // 12: SmithyGetListResp.data:type_name -> DBSmithy
|
||||
13, // [13:13] is the sub-list for method output_type
|
||||
13, // [13:13] is the sub-list for method input_type
|
||||
13, // [13:13] is the sub-list for extension type_name
|
||||
13, // [13:13] is the sub-list for extension extendee
|
||||
0, // [0:13] is the sub-list for field type_name
|
||||
29, // 6: SmithyCustomerResp.customers:type_name -> CustomerInfo
|
||||
30, // 7: SmithyCreateOrderReq.order:type_name -> OrderClang
|
||||
31, // 8: SmithyCreateOrderResp.data:type_name -> DBSmithy
|
||||
31, // 9: SmithyGetRewardResp.data:type_name -> DBSmithy
|
||||
31, // 10: SmithyDeskSkillLvResp.data:type_name -> DBSmithy
|
||||
31, // 11: SmithyStoveSkillLvResp.data:type_name -> DBSmithy
|
||||
32, // 12: SmithyGetRandUserResp.user:type_name -> DBUser
|
||||
31, // 13: SmithyGetListResp.data:type_name -> DBSmithy
|
||||
14, // [14:14] is the sub-list for method output_type
|
||||
14, // [14:14] is the sub-list for method input_type
|
||||
14, // [14:14] is the sub-list for extension type_name
|
||||
14, // [14:14] is the sub-list for extension extendee
|
||||
0, // [0:14] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_smithy_smithy_msg_proto_init() }
|
||||
|
||||
@ -12,11 +12,17 @@ import "errors"
|
||||
|
||||
type GameNewSmithyData struct {
|
||||
Id int32
|
||||
ItemId int32
|
||||
Type int32
|
||||
Consume []*Gameatn
|
||||
Temperature int32
|
||||
Quality *Gameatn
|
||||
DrawingName string
|
||||
QualityText string
|
||||
BasicDrop int32
|
||||
BasicCos []*Gameatn
|
||||
TemperatureCos int32
|
||||
RefineCos *Gameatn
|
||||
CustomizedCos1 *Gameatn
|
||||
CustomizedCos2 *Gameatn
|
||||
CustomizedLv []int32
|
||||
CustomizedLvDistribution []int32
|
||||
}
|
||||
|
||||
const TypeId_GameNewSmithyData = -1249020316
|
||||
@ -27,24 +33,56 @@ func (*GameNewSmithyData) GetTypeId() int32 {
|
||||
|
||||
func (_v *GameNewSmithyData)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["item_id"].(float64); !_ok_ { err = errors.New("item_id error"); return }; _v.ItemId = int32(_tempNum_) }
|
||||
{ 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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["drawing_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.DrawingName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.DrawingName, _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["quality_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.QualityText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.QualityText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["basic_drop"].(float64); !_ok_ { err = errors.New("basic_drop error"); return }; _v.BasicDrop = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["consume"].([]interface{}); !_ok_ { err = errors.New("consume error"); return }
|
||||
if _arr_, _ok_ = _buf["basic_cos"].([]interface{}); !_ok_ { err = errors.New("basic_cos error"); return }
|
||||
|
||||
_v.Consume = make([]*Gameatn, 0, len(_arr_))
|
||||
_v.BasicCos = 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.Consume = append(_v.Consume, _list_v_)
|
||||
_v.BasicCos = append(_v.BasicCos, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature_cos"].(float64); !_ok_ { err = errors.New("temperature_cos error"); return }; _v.TemperatureCos = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["refine_cos"].(map[string]interface{}); !_ok_ { err = errors.New("refine_cos error"); return }; if _v.RefineCos, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos1"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos1 error"); return }; if _v.CustomizedCos1, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos2"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos2 error"); return }; if _v.CustomizedCos2, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["customized_lv"].([]interface{}); !_ok_ { err = errors.New("customized_lv error"); return }
|
||||
|
||||
_v.CustomizedLv = 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.CustomizedLv = append(_v.CustomizedLv, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["customized_lv_distribution"].([]interface{}); !_ok_ { err = errors.New("customized_lv_distribution error"); return }
|
||||
|
||||
_v.CustomizedLvDistribution = 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.CustomizedLvDistribution = append(_v.CustomizedLvDistribution, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature"].(float64); !_ok_ { err = errors.New("temperature error"); return }; _v.Temperature = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["quality"].(map[string]interface{}); !_ok_ { err = errors.New("quality error"); return }; if _v.Quality, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@ import "errors"
|
||||
type GameSmithyProficiencyData struct {
|
||||
Id int32
|
||||
Proficiency int32
|
||||
ReelId int32
|
||||
ProficiencyLv int32
|
||||
ReelId int32
|
||||
TitleText string
|
||||
ContentText string
|
||||
Type int32
|
||||
@ -31,8 +31,8 @@ func (*GameSmithyProficiencyData) GetTypeId() int32 {
|
||||
func (_v *GameSmithyProficiencyData)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["proficiency"].(float64); !_ok_ { err = errors.New("proficiency error"); return }; _v.Proficiency = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reelId"].(float64); !_ok_ { err = errors.New("reelId error"); return }; _v.ReelId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["proficiency_lv"].(float64); !_ok_ { err = errors.New("proficiency_lv error"); return }; _v.ProficiencyLv = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reelId"].(float64); !_ok_ { err = errors.New("reelId error"); return }; _v.ReelId = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TitleText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TitleText, _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["content_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ContentText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ContentText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text 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_) }
|
||||
|
||||
@ -16,6 +16,8 @@ type GameDropData struct {
|
||||
Prize []*Gameatn
|
||||
Star int32
|
||||
P int32
|
||||
EnableType int32
|
||||
Condition int32
|
||||
}
|
||||
|
||||
const TypeId_GameDropData = 1700203957
|
||||
@ -43,6 +45,8 @@ func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enable_type"].(float64); !_ok_ { err = errors.New("enable_type error"); return }; _v.EnableType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -175,6 +175,7 @@ type GameGlobalData struct {
|
||||
RotateDizzyTime float32
|
||||
Moonshopmoney []int32
|
||||
Generaltp *Gameatn
|
||||
SmithyPurchaseType []int32
|
||||
}
|
||||
|
||||
const TypeId_GameGlobalData = 477542761
|
||||
@ -738,6 +739,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["generaltp"].(map[string]interface{}); !_ok_ { err = errors.New("generaltp error"); return }; if _v.Generaltp, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["smithy_PurchaseType"].([]interface{}); !_ok_ { err = errors.New("smithy_PurchaseType error"); return }
|
||||
|
||||
_v.SmithyPurchaseType = 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.SmithyPurchaseType = append(_v.SmithyPurchaseType, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user