Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
a48da2c0d0
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
||||
{
|
||||
"key": "51004",
|
||||
"type": 1,
|
||||
"herocolor": 4,
|
||||
"herocolor": 1,
|
||||
"hero": 51004,
|
||||
"img": "tx_js_51004",
|
||||
"intr": {
|
||||
@ -26,7 +26,7 @@
|
||||
{
|
||||
"key": "25001",
|
||||
"type": 2,
|
||||
"herocolor": 5,
|
||||
"herocolor": 2,
|
||||
"hero": 25001,
|
||||
"img": "tx_js_51012",
|
||||
"intr": {
|
||||
@ -56,7 +56,7 @@
|
||||
{
|
||||
"key": "13002",
|
||||
"type": 2,
|
||||
"herocolor": 5,
|
||||
"herocolor": 2,
|
||||
"hero": 13002,
|
||||
"img": "tx_js_51012",
|
||||
"intr": {
|
||||
@ -86,7 +86,7 @@
|
||||
{
|
||||
"key": "33003",
|
||||
"type": 2,
|
||||
"herocolor": 5,
|
||||
"herocolor": 3,
|
||||
"hero": 33003,
|
||||
"img": "tx_js_51012",
|
||||
"intr": {
|
||||
@ -116,7 +116,7 @@
|
||||
{
|
||||
"key": "13005",
|
||||
"type": 2,
|
||||
"herocolor": 5,
|
||||
"herocolor": 3,
|
||||
"hero": 13005,
|
||||
"img": "tx_js_51012",
|
||||
"intr": {
|
||||
|
||||
@ -808,5 +808,15 @@
|
||||
},
|
||||
"data": "昵称",
|
||||
"prefix": "bingo:create,{0}"
|
||||
},
|
||||
{
|
||||
"id": 82,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_129",
|
||||
"text": "挑战主线关卡XX关（填关卡Id）"
|
||||
},
|
||||
"data": "1104012",
|
||||
"prefix": "bingo:mainline,{0}"
|
||||
}
|
||||
]
|
||||
@ -729,5 +729,578 @@
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000501,
|
||||
"group": 5,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtaskexit_accept_20100",
|
||||
"followtj": "",
|
||||
"followguide": 1000502,
|
||||
"finger": [
|
||||
"taskDedailsPopup",
|
||||
"btn_star$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.3,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000502,
|
||||
"group": 5,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 1000503,
|
||||
"finger": [
|
||||
"maininterface",
|
||||
"btn_integration$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.3,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000503,
|
||||
"group": 5,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"WorldPointDetailsPopup",
|
||||
"gotoBtn$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000601,
|
||||
"group": 6,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "funcopen_treasuremap",
|
||||
"followtj": "",
|
||||
"followguide": 1000602,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btnInfo$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000602,
|
||||
"group": 6,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btnInfo$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000701,
|
||||
"group": 7,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "funcopen_moonlevel",
|
||||
"followtj": "",
|
||||
"followguide": 1000702,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btn_moonLevel$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000702,
|
||||
"group": 7,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"moonLevelWindow",
|
||||
"tasklist$",
|
||||
"0",
|
||||
"btn_receive$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000801,
|
||||
"group": 8,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "vikingexpedition_experience",
|
||||
"followtj": "",
|
||||
"followguide": 1000802,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btn_integration$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000802,
|
||||
"group": 8,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 1000803,
|
||||
"finger": [
|
||||
"gameSummary",
|
||||
"list$",
|
||||
"9"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000803,
|
||||
"group": 8,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 1000804,
|
||||
"finger": [
|
||||
"WorldPointDetailsPopup",
|
||||
"gotoBtn$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000804,
|
||||
"group": 8,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"RacePagodaWindow",
|
||||
"upbtn$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000901,
|
||||
"group": 9,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "worldtasksubfinish_20112",
|
||||
"followtj": "",
|
||||
"followguide": 1000902,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btnInfo$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000902,
|
||||
"group": 9,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 1000903,
|
||||
"finger": [
|
||||
"mainline",
|
||||
"btn0$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 0,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000903,
|
||||
"group": 9,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 1000904,
|
||||
"finger": [
|
||||
"WorldPointDetailsPopup",
|
||||
"gotoBtn$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
},
|
||||
{
|
||||
"id": 1000904,
|
||||
"group": 9,
|
||||
"type": 3,
|
||||
"startPar": "",
|
||||
"parameter": "",
|
||||
"interface": "",
|
||||
"condition": "",
|
||||
"followtj": "",
|
||||
"followguide": 0,
|
||||
"finger": [
|
||||
"RacePagodaWindow",
|
||||
"upbtn$"
|
||||
],
|
||||
"offset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"fingerTime": 0.5,
|
||||
"objSize": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"objOffset": {
|
||||
"x": 0,
|
||||
"y": 0
|
||||
},
|
||||
"txt": "",
|
||||
"speakerface": 0,
|
||||
"sound": "",
|
||||
"mask": 0,
|
||||
"lock": 0,
|
||||
"uishow": 0,
|
||||
"skiptime": 5000,
|
||||
"skip": 0,
|
||||
"skipgroup": 0,
|
||||
"reward": []
|
||||
}
|
||||
]
|
||||
@ -1748,8 +1748,8 @@
|
||||
"key": "hero_main_name_24002",
|
||||
"text": "牙仙"
|
||||
},
|
||||
"star": 3,
|
||||
"color": 2,
|
||||
"star": 4,
|
||||
"color": 3,
|
||||
"race": 2,
|
||||
"job": 1,
|
||||
"type": 1,
|
||||
@ -1815,7 +1815,7 @@
|
||||
"expitem": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000011",
|
||||
"t": "10000012",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
@ -2412,8 +2412,8 @@
|
||||
"key": "hero_main_name_25001",
|
||||
"text": "阿宝"
|
||||
},
|
||||
"star": 5,
|
||||
"color": 4,
|
||||
"star": 4,
|
||||
"color": 3,
|
||||
"race": 2,
|
||||
"job": 2,
|
||||
"type": 1,
|
||||
@ -2479,7 +2479,7 @@
|
||||
"expitem": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000013",
|
||||
"t": "10000012",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
|
||||
@ -21390,5 +21390,87 @@
|
||||
},
|
||||
"sale": [],
|
||||
"gm": 0
|
||||
},
|
||||
{
|
||||
"id": "17011001",
|
||||
"name": {
|
||||
"key": "item_item_name_434",
|
||||
"text": "无极四件套宝箱"
|
||||
},
|
||||
"usetype": 1,
|
||||
"color": 3,
|
||||
"bagtype": 1,
|
||||
"index": 1,
|
||||
"special_type": 0,
|
||||
"hold": 0,
|
||||
"time": 0,
|
||||
"reddottype": 0,
|
||||
"effects": "",
|
||||
"modelName": "",
|
||||
"box_id": 18001005,
|
||||
"synthetize_num": 0,
|
||||
"synthetize_deplete": [],
|
||||
"synthetize_get": [],
|
||||
"decompose_deplete": [],
|
||||
"decompose_get": [],
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 0,
|
||||
"img": "item_17050006",
|
||||
"intr": {
|
||||
"key": "item_item_intr_436",
|
||||
"text": "由龙币兑换的宝箱，购买后获得紫色无极套装4件装备。"
|
||||
},
|
||||
"describe": {
|
||||
"key": "item_item_describe_436",
|
||||
"text": "无极，太极？"
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_item_dialogue_434",
|
||||
"text": "【好多装备！】"
|
||||
},
|
||||
"sale": [],
|
||||
"gm": 1
|
||||
},
|
||||
{
|
||||
"id": "10000040",
|
||||
"name": {
|
||||
"key": "item_item_name_434",
|
||||
"text": "辉月盾"
|
||||
},
|
||||
"usetype": 1,
|
||||
"color": 4,
|
||||
"bagtype": 0,
|
||||
"index": 1,
|
||||
"special_type": 0,
|
||||
"hold": 0,
|
||||
"time": 0,
|
||||
"reddottype": 0,
|
||||
"effects": "",
|
||||
"modelName": "",
|
||||
"box_id": 0,
|
||||
"synthetize_num": 0,
|
||||
"synthetize_deplete": [],
|
||||
"synthetize_get": [],
|
||||
"decompose_deplete": [],
|
||||
"decompose_get": [],
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 0,
|
||||
"img": "item_10000037",
|
||||
"intr": {
|
||||
"key": "item_item_intr_436",
|
||||
"text": ""
|
||||
},
|
||||
"describe": {
|
||||
"key": "item_item_describe_436",
|
||||
"text": ""
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_item_dialogue_434",
|
||||
"text": ""
|
||||
},
|
||||
"sale": [],
|
||||
"gm": 0
|
||||
}
|
||||
]
|
||||
@ -98470,5 +98470,101 @@
|
||||
"playerlvmin": 0,
|
||||
"playerlvmax": 0,
|
||||
"notice": 0
|
||||
},
|
||||
{
|
||||
"id": 4104,
|
||||
"lotteryid": 18001005,
|
||||
"description": "主线关卡第一章商店装备宝箱",
|
||||
"type": 2,
|
||||
"groupwt": 1000,
|
||||
"groupid": 11001,
|
||||
"subtype": 2,
|
||||
"groupnum": 1,
|
||||
"itemid": {
|
||||
"a": "equi",
|
||||
"t": "10130",
|
||||
"n": 1
|
||||
},
|
||||
"itemdes": "无极神功",
|
||||
"itemwt": 1000,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"VIPmin": 0,
|
||||
"VIPmax": 15,
|
||||
"playerlvmin": 0,
|
||||
"playerlvmax": 0,
|
||||
"notice": 0
|
||||
},
|
||||
{
|
||||
"id": 4105,
|
||||
"lotteryid": 18001005,
|
||||
"description": "主线关卡第一章商店装备宝箱",
|
||||
"type": 2,
|
||||
"groupwt": 1000,
|
||||
"groupid": 11001,
|
||||
"subtype": 2,
|
||||
"groupnum": 1,
|
||||
"itemid": {
|
||||
"a": "equi",
|
||||
"t": "10131",
|
||||
"n": 1
|
||||
},
|
||||
"itemdes": "无极神功",
|
||||
"itemwt": 1000,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"VIPmin": 0,
|
||||
"VIPmax": 15,
|
||||
"playerlvmin": 0,
|
||||
"playerlvmax": 0,
|
||||
"notice": 0
|
||||
},
|
||||
{
|
||||
"id": 4106,
|
||||
"lotteryid": 18001005,
|
||||
"description": "主线关卡第一章商店装备宝箱",
|
||||
"type": 2,
|
||||
"groupwt": 1000,
|
||||
"groupid": 11001,
|
||||
"subtype": 2,
|
||||
"groupnum": 1,
|
||||
"itemid": {
|
||||
"a": "equi",
|
||||
"t": "10132",
|
||||
"n": 1
|
||||
},
|
||||
"itemdes": "无极神功",
|
||||
"itemwt": 1000,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"VIPmin": 0,
|
||||
"VIPmax": 15,
|
||||
"playerlvmin": 0,
|
||||
"playerlvmax": 0,
|
||||
"notice": 0
|
||||
},
|
||||
{
|
||||
"id": 4107,
|
||||
"lotteryid": 18001005,
|
||||
"description": "主线关卡第一章商店装备宝箱",
|
||||
"type": 2,
|
||||
"groupwt": 1000,
|
||||
"groupid": 11001,
|
||||
"subtype": 2,
|
||||
"groupnum": 1,
|
||||
"itemid": {
|
||||
"a": "equi",
|
||||
"t": "10133",
|
||||
"n": 1
|
||||
},
|
||||
"itemdes": "无极神功",
|
||||
"itemwt": 1000,
|
||||
"min": 1,
|
||||
"max": 1,
|
||||
"VIPmin": 0,
|
||||
"VIPmax": 15,
|
||||
"playerlvmin": 0,
|
||||
"playerlvmax": 0,
|
||||
"notice": 0
|
||||
}
|
||||
]
|
||||
@ -99,7 +99,7 @@
|
||||
},
|
||||
"venturetype": 1,
|
||||
"ventureavatar": [
|
||||
"Person/24004/24005_q.prefab"
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
@ -216,7 +216,7 @@
|
||||
},
|
||||
"venturetype": 1,
|
||||
"ventureavatar": [
|
||||
"Person/24004/24006_q.prefab"
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
@ -295,7 +295,7 @@
|
||||
},
|
||||
"venturetype": 1,
|
||||
"ventureavatar": [
|
||||
"Person/24004/24007_q.prefab"
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
@ -1142,8 +1142,6 @@
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"Effect/Skill/Common/effect_screen_smoke.prefab",
|
||||
"huo",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -1206,7 +1204,7 @@
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 1,
|
||||
"Episodetype": 3,
|
||||
"stage_param": 0,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
@ -1243,7 +1241,7 @@
|
||||
"progress": 1,
|
||||
"stroyshow": 0,
|
||||
"frontstoryid": 200180,
|
||||
"afterstoryid": 200181,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -1253,71 +1251,33 @@
|
||||
"text": "1-13"
|
||||
},
|
||||
"title": {
|
||||
"key": "mainchapter_main_stage_title_12",
|
||||
"text": "猎龙团来袭"
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"desc": {
|
||||
"key": "mainchapter_main_stage_desc_4",
|
||||
"text": "成群结对的猎龙团强势袭来，小小的博克岛火光冲天，快拿起武器捍卫家园！"
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 300,
|
||||
"ps_consume": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 9
|
||||
}
|
||||
],
|
||||
"ps_mg": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "ps",
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"firstaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 6000
|
||||
}
|
||||
],
|
||||
"lotteryward": 17110110,
|
||||
"commonaward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 6000
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10103001,
|
||||
"FormatList": [
|
||||
101041
|
||||
],
|
||||
"hero_exp": 0,
|
||||
"ps_consume": [],
|
||||
"ps_mg": [],
|
||||
"firstaward": [],
|
||||
"lotteryward": 0,
|
||||
"commonaward": [],
|
||||
"BattleReadyID": 0,
|
||||
"FormatList": [],
|
||||
"helphero": [],
|
||||
"banhero": [],
|
||||
"star": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
],
|
||||
"star_type": [
|
||||
1,
|
||||
2,
|
||||
2
|
||||
],
|
||||
"star_value": [
|
||||
0,
|
||||
2,
|
||||
1
|
||||
],
|
||||
"star": [],
|
||||
"star_type": [],
|
||||
"star_value": [],
|
||||
"challengeward": 0
|
||||
},
|
||||
{
|
||||
"id": 1101014,
|
||||
"chapterid": 11001,
|
||||
"group_id": 100113,
|
||||
"group_id": 1001122,
|
||||
"previous_group_id": [
|
||||
1001121
|
||||
],
|
||||
@ -1325,7 +1285,7 @@
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
"Episodetype": 4,
|
||||
"Episodetype": 1,
|
||||
"stage_param": 0,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
@ -1354,30 +1314,30 @@
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"bubbletext": {
|
||||
"key": "main_stage_bubbletext_13",
|
||||
"text": "不要再抵抗了，愚蠢的人们！"
|
||||
"text": "这是发生了什么？！"
|
||||
},
|
||||
"animation": [],
|
||||
"hide": 0,
|
||||
"destroy": 1,
|
||||
"progress": 1,
|
||||
"stroyshow": 0,
|
||||
"frontstoryid": 200190,
|
||||
"afterstoryid": 0,
|
||||
"frontstoryid": 200181,
|
||||
"afterstoryid": 200182,
|
||||
"maingroupName": {
|
||||
"key": "mainchapter_main_stage_maingroupName_1",
|
||||
"text": "打败猎龙团！"
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"mainlineName": {
|
||||
"key": "mainchapter_main_stage_mainlineName_13",
|
||||
"text": "1-13"
|
||||
},
|
||||
"title": {
|
||||
"key": "mainchapter_main_stage_title_13",
|
||||
"key": "mainchapter_main_stage_title_12",
|
||||
"text": "猎龙团来袭"
|
||||
},
|
||||
"desc": {
|
||||
"key": "mainchapter_main_stage_desc_5",
|
||||
"text": "别停下脚步，快挥舞你手中的武器，进攻！进攻！！进攻！！！"
|
||||
"key": "mainchapter_main_stage_desc_4",
|
||||
"text": "成群结对的猎龙团强势袭来，小小的博克岛火光冲天，快拿起武器捍卫家园！"
|
||||
},
|
||||
"exp": 0,
|
||||
"hero_exp": 300,
|
||||
@ -1438,9 +1398,9 @@
|
||||
"chapterid": 11001,
|
||||
"group_id": 100113,
|
||||
"previous_group_id": [
|
||||
1001121
|
||||
1001122
|
||||
],
|
||||
"previoustage": 1101014,
|
||||
"previoustage": 0,
|
||||
"buried_type": 0,
|
||||
"buried": 0,
|
||||
"grouptype": [],
|
||||
@ -1480,7 +1440,7 @@
|
||||
"destroy": 1,
|
||||
"progress": 1,
|
||||
"stroyshow": 0,
|
||||
"frontstoryid": 0,
|
||||
"frontstoryid": 200190,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "mainchapter_main_stage_maingroupName_1",
|
||||
@ -1557,7 +1517,7 @@
|
||||
"chapterid": 11001,
|
||||
"group_id": 100113,
|
||||
"previous_group_id": [
|
||||
1001121
|
||||
1001122
|
||||
],
|
||||
"previoustage": 1101015,
|
||||
"buried_type": 0,
|
||||
@ -1928,7 +1888,7 @@
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"scene_effectfilter": "效果8",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
@ -2005,7 +1965,7 @@
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"scene_effectfilter": "效果8",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
@ -2088,7 +2048,7 @@
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"scene_effectfilter": "效果8",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
@ -2175,7 +2135,7 @@
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
"scene_effectfilter": "效果8",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
|
||||
@ -32,22 +32,5 @@
|
||||
"n": 20
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 3,
|
||||
"Level": 3,
|
||||
"TaskGroupId": 1003,
|
||||
"Reward": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 5
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "starcoin",
|
||||
"n": 20
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -2,97 +2,7 @@
|
||||
{
|
||||
"Id": 1,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110001,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110003,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 3,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110004,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110005,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 5,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110006,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 6,
|
||||
"TaskGroup": 1001,
|
||||
"TaskId": 110007,
|
||||
"TaskId": 17001001,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -110,7 +20,7 @@
|
||||
{
|
||||
"Id": 7,
|
||||
"TaskGroup": 1002,
|
||||
"TaskId": 110008,
|
||||
"TaskId": 17002001,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -128,7 +38,7 @@
|
||||
{
|
||||
"Id": 8,
|
||||
"TaskGroup": 1002,
|
||||
"TaskId": 110009,
|
||||
"TaskId": 17002002,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -146,115 +56,7 @@
|
||||
{
|
||||
"Id": 9,
|
||||
"TaskGroup": 1002,
|
||||
"TaskId": 110010,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 10,
|
||||
"TaskGroup": 1002,
|
||||
"TaskId": 110012,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 11,
|
||||
"TaskGroup": 1002,
|
||||
"TaskId": 110013,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 12,
|
||||
"TaskGroup": 1003,
|
||||
"TaskId": 110014,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 13,
|
||||
"TaskGroup": 1003,
|
||||
"TaskId": 110015,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 14,
|
||||
"TaskGroup": 1003,
|
||||
"TaskId": 110016,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 5000
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000001",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"JumpFunction": 0
|
||||
},
|
||||
{
|
||||
"Id": 15,
|
||||
"TaskGroup": 1003,
|
||||
"TaskId": 110017,
|
||||
"TaskId": 17002003,
|
||||
"TaskReward": [
|
||||
{
|
||||
"a": "attr",
|
||||
|
||||
@ -1207,7 +1207,7 @@
|
||||
"id": "role",
|
||||
"name": {
|
||||
"key": "opencond_opencond_name_44",
|
||||
"text": "主角"
|
||||
"text": "主角头像"
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
@ -1227,8 +1227,36 @@
|
||||
"kqbx": 0,
|
||||
"kqbx_ui": "",
|
||||
"kqbx_text": {
|
||||
"key": "opencond_opencond_kqbx_text_44",
|
||||
"text": "主角等级达到1开启"
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "rolename",
|
||||
"name": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
"key": 3,
|
||||
"param": 20034
|
||||
}
|
||||
],
|
||||
"wkqbx": 2,
|
||||
"img": "",
|
||||
"prompt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"uiid": 0,
|
||||
"activateType": 0,
|
||||
"notify": [],
|
||||
"kqbx": 0,
|
||||
"kqbx_ui": "",
|
||||
"kqbx_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -22,5 +22,11 @@
|
||||
"pay_id": "passcheck_4",
|
||||
"paypro_id": "passcheckPro_4",
|
||||
"paymid_id": "passcheckMid_4"
|
||||
},
|
||||
{
|
||||
"passcheck_type": 5,
|
||||
"pay_id": "passcheck_4",
|
||||
"paypro_id": "passcheckPro_4",
|
||||
"paymid_id": ""
|
||||
}
|
||||
]
|
||||
@ -2,10 +2,12 @@
|
||||
{
|
||||
"id": 2007,
|
||||
"buff_type": 2005,
|
||||
"trigger_pro": 0,
|
||||
"describe": {
|
||||
"key": "td_t_skill_describe_name2007",
|
||||
"text": "超载：每次攻击获得一层超载。 每层攻击速度-25% 超载伤害+30% 达到三层持续10秒，之后重置。弓箭超载特殊效果：超载达到3层的弓箭能无视铁甲"
|
||||
},
|
||||
"overlay_type": 0,
|
||||
"effectType": [
|
||||
22,
|
||||
2
|
||||
@ -14,6 +16,8 @@
|
||||
-250,
|
||||
300
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"effect_Range": 0,
|
||||
"max_layer": 1,
|
||||
"layer_effectType": [],
|
||||
"layer_value": [],
|
||||
@ -24,12 +28,16 @@
|
||||
{
|
||||
"id": 2008,
|
||||
"buff_type": 2006,
|
||||
"trigger_pro": 0,
|
||||
"describe": {
|
||||
"key": "td_t_skill_describe_name2008",
|
||||
"text": "流血：有25%概率给敌方追加一层流血 每秒60%伤害 最多四层。流血特殊效果：每层流血会降低敌方治疗效果10%"
|
||||
},
|
||||
"overlay_type": 0,
|
||||
"effectType": [],
|
||||
"value": [],
|
||||
"target_buffId": 0,
|
||||
"effect_Range": 0,
|
||||
"max_layer": 0,
|
||||
"layer_effectType": [],
|
||||
"layer_value": [],
|
||||
@ -40,12 +48,16 @@
|
||||
{
|
||||
"id": 2009,
|
||||
"buff_type": 2007,
|
||||
"trigger_pro": 0,
|
||||
"describe": {
|
||||
"key": "td_t_skill_describe_name2009",
|
||||
"text": "狂暴：每次攻击50概率获得1层狂暴 每层伤害加5% 攻速加5% 爆炸范围+3% 最多10层 持续10秒 之后重置"
|
||||
},
|
||||
"overlay_type": 0,
|
||||
"effectType": [],
|
||||
"value": [],
|
||||
"target_buffId": 0,
|
||||
"effect_Range": 0,
|
||||
"max_layer": 0,
|
||||
"layer_effectType": [],
|
||||
"layer_value": [],
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
"num": 0,
|
||||
"explosion_Range": 0,
|
||||
"catapult": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"pro": 1000,
|
||||
"explosion_effect": ""
|
||||
},
|
||||
@ -44,6 +46,8 @@
|
||||
"num": 0,
|
||||
"explosion_Range": 3,
|
||||
"catapult": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"pro": 1000,
|
||||
"explosion_effect": "effect_ui_baozha"
|
||||
},
|
||||
@ -68,6 +72,8 @@
|
||||
"num": 0,
|
||||
"explosion_Range": 0,
|
||||
"catapult": 1,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"pro": 1000,
|
||||
"explosion_effect": ""
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
[
|
||||
{
|
||||
"skill_id": 1001,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name1001",
|
||||
@ -10,19 +11,21 @@
|
||||
"key": "td_t_skill_describe_des1001",
|
||||
"text": "分裂+1"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
1
|
||||
],
|
||||
"value": [
|
||||
1
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 5,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 1002,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name1002",
|
||||
@ -32,17 +35,19 @@
|
||||
"key": "td_t_skill_describe_des1002",
|
||||
"text": "击中目标后，对目标造成5%减速"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [],
|
||||
"value": [
|
||||
50
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 1003,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name1003",
|
||||
@ -52,19 +57,21 @@
|
||||
"key": "td_t_skill_describe_des1003",
|
||||
"text": "伤害+10%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
2
|
||||
],
|
||||
"value": [
|
||||
100
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 1004,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name1004",
|
||||
@ -74,19 +81,21 @@
|
||||
"key": "td_t_skill_describe_des1004",
|
||||
"text": "射击频率+10%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
4
|
||||
],
|
||||
"value": [
|
||||
100
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 1005,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name1005",
|
||||
@ -96,19 +105,21 @@
|
||||
"key": "td_t_skill_describe_des1005",
|
||||
"text": "飞行速度+10%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
3
|
||||
],
|
||||
"value": [
|
||||
100
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 2001,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name2001",
|
||||
@ -118,19 +129,21 @@
|
||||
"key": "td_t_skill_describe_des2001",
|
||||
"text": "所有武器伤害攻击力+5%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
20
|
||||
],
|
||||
"value": [
|
||||
5
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 2002,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name2002",
|
||||
@ -140,19 +153,21 @@
|
||||
"key": "td_t_skill_describe_des2002",
|
||||
"text": "所有武器射击频率+5%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
22
|
||||
],
|
||||
"value": [
|
||||
5
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 2003,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name2003",
|
||||
@ -162,8 +177,6 @@
|
||||
"key": "td_t_skill_describe_des2003",
|
||||
"text": "城墙生命值上限+5，并额外恢复5点生命值"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
42,
|
||||
41
|
||||
@ -172,11 +185,15 @@
|
||||
5,
|
||||
5
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 2004,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name2004",
|
||||
@ -186,19 +203,21 @@
|
||||
"key": "td_t_skill_describe_des2004",
|
||||
"text": "城墙生命值上限+10"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
42
|
||||
],
|
||||
"value": [
|
||||
10
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 2005,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name2005",
|
||||
@ -208,19 +227,21 @@
|
||||
"key": "td_t_skill_describe_des2005",
|
||||
"text": "城墙恢复10点生命值"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
41
|
||||
],
|
||||
"value": [
|
||||
0
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 3001,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name3001",
|
||||
@ -230,19 +251,21 @@
|
||||
"key": "td_t_skill_describe_des3001",
|
||||
"text": "{0}能够额外穿透1个怪物"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
1
|
||||
],
|
||||
"value": [
|
||||
1
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 5,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 3002,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name3002",
|
||||
@ -252,19 +275,21 @@
|
||||
"key": "td_t_skill_describe_des3002",
|
||||
"text": "{0}爆炸范围+10%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
5
|
||||
],
|
||||
"value": [
|
||||
100
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 3003,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name3003",
|
||||
@ -274,19 +299,21 @@
|
||||
"key": "td_t_skill_describe_des3003",
|
||||
"text": "{0}弹射次数+1"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
6
|
||||
],
|
||||
"value": [
|
||||
1
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 5,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4001,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4001",
|
||||
@ -296,19 +323,21 @@
|
||||
"key": "td_t_skill_describe_des4001",
|
||||
"text": "所有武器伤害攻击力+5%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
20
|
||||
],
|
||||
"value": [
|
||||
50
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4002,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4002",
|
||||
@ -318,19 +347,21 @@
|
||||
"key": "td_t_skill_describe_des4002",
|
||||
"text": "所有武器射击频率+5%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
22
|
||||
],
|
||||
"value": [
|
||||
50
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4003,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4003",
|
||||
@ -340,19 +371,21 @@
|
||||
"key": "td_t_skill_describe_des4003",
|
||||
"text": "所有弹道飞行速度+5%"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
21
|
||||
],
|
||||
"value": [
|
||||
50
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 0,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4004,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4004",
|
||||
@ -362,8 +395,6 @@
|
||||
"key": "td_t_skill_describe_des4004",
|
||||
"text": "城墙生命值上限+5，并额外恢复5点生命值"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
42,
|
||||
41
|
||||
@ -372,11 +403,15 @@
|
||||
5,
|
||||
5
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4005,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4005",
|
||||
@ -386,19 +421,21 @@
|
||||
"key": "td_t_skill_describe_des4005",
|
||||
"text": "城墙生命值上限+10"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
42
|
||||
],
|
||||
"value": [
|
||||
10
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
},
|
||||
{
|
||||
"skill_id": 4006,
|
||||
"skill_triggerType": 0,
|
||||
"icon": "",
|
||||
"name": {
|
||||
"key": "td_t_skill_describe_name4006",
|
||||
@ -408,14 +445,15 @@
|
||||
"key": "td_t_skill_describe_des4006",
|
||||
"text": "城墙恢复10点生命值"
|
||||
},
|
||||
"trigger_type": 0,
|
||||
"trigger_pro": 0,
|
||||
"skilltype": [
|
||||
41
|
||||
],
|
||||
"value": [
|
||||
0
|
||||
],
|
||||
"target_buffId": 0,
|
||||
"self_buff": [],
|
||||
"target_buff": [],
|
||||
"maxlv": 10,
|
||||
"pro": 1000
|
||||
}
|
||||
|
||||
@ -2,7 +2,38 @@
|
||||
{
|
||||
"id": 1,
|
||||
"pic": "cbt_sp01_00",
|
||||
"type": 0,
|
||||
"unlock": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012012",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012013",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012014",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012012",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012013",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012014",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "24012012",
|
||||
@ -35,6 +66,7 @@
|
||||
{
|
||||
"id": 2,
|
||||
"pic": "cbt_sp01_00",
|
||||
"type": 1,
|
||||
"unlock": [],
|
||||
"name": {
|
||||
"key": "treasuremap_map_name_2",
|
||||
|
||||
@ -66,11 +66,13 @@
|
||||
},
|
||||
"get_item": [],
|
||||
"trigger": 0,
|
||||
"npc": 10018,
|
||||
"completetask": [],
|
||||
"npc": 10010,
|
||||
"completetask": [
|
||||
12070012
|
||||
],
|
||||
"deliver_npc": 0,
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 0,
|
||||
"auto_accept": 2,
|
||||
"tasktips": 1,
|
||||
"deliver_task": 0,
|
||||
"lock_add": 0,
|
||||
@ -568,7 +570,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 1,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 1,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -609,7 +611,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -650,7 +652,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -691,7 +693,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -732,7 +734,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -773,7 +775,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -814,7 +816,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -855,7 +857,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -896,7 +898,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -937,7 +939,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -978,7 +980,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -1019,7 +1021,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -1060,7 +1062,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -1101,7 +1103,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -1142,7 +1144,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 2,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
@ -1183,7 +1185,7 @@
|
||||
"taskend_removeitem": [],
|
||||
"auto_accept": 0,
|
||||
"tasktips": 0,
|
||||
"deliver_task": 0,
|
||||
"deliver_task": 1,
|
||||
"lock_add": 0,
|
||||
"finish": [],
|
||||
"finishparameter": "",
|
||||
|
||||
@ -676,11 +676,15 @@ type (
|
||||
IDColor interface {
|
||||
CreateRoom(sessions []IUserSession, rulesStr string) (roomid string, err error)
|
||||
UserOffline(roomid string, uid string) (err error)
|
||||
//主动认输
|
||||
AdmitDefeat(roomid string, uid string) (err error)
|
||||
}
|
||||
//犬兔大战
|
||||
ICanineRabbit interface {
|
||||
CreateRoom(sessions []IUserSession, rulesStr string) (roomid string, err error)
|
||||
UserOffline(roomid string, uid string) (err error)
|
||||
//主动认输
|
||||
AdmitDefeat(roomid string, uid string) (err error)
|
||||
}
|
||||
IEntertainment interface {
|
||||
// 添加三消卡片资源
|
||||
@ -692,6 +696,13 @@ type (
|
||||
//捉虫子
|
||||
ICatchBugs interface {
|
||||
CreateRoom(sessions []IUserSession, rulesStr string) (roomid string, err error)
|
||||
//用户离线
|
||||
UserOffline(roomid string, uid string) (err error)
|
||||
//主动认输
|
||||
AdmitDefeat(roomid string, uid string) (err error)
|
||||
}
|
||||
//海岛
|
||||
IIsland interface {
|
||||
IPayDelivery
|
||||
}
|
||||
)
|
||||
|
||||
@ -170,3 +170,15 @@ func (this *CanineRabbit) UserOffline(roomid string, uid string) (err error) {
|
||||
err = room.PlayerWin(uid, &pb.CanineRabbitWinReq{Roomid: roomid, Iswin: false})
|
||||
return
|
||||
}
|
||||
|
||||
//用户离线
|
||||
func (this *CanineRabbit) AdmitDefeat(roomid string, uid string) (err error) {
|
||||
var (
|
||||
room *Room
|
||||
)
|
||||
if room, err = this.rooms.queryRoom(roomid); err != nil {
|
||||
return
|
||||
}
|
||||
err = room.PlayerWin(uid, &pb.CanineRabbitWinReq{Roomid: roomid, Iswin: false})
|
||||
return
|
||||
}
|
||||
|
||||
@ -169,3 +169,15 @@ func (this *CatchBugs) UserOffline(roomid string, uid string) (err error) {
|
||||
err = room.PlayerOffline(uid)
|
||||
return
|
||||
}
|
||||
|
||||
//用户离线
|
||||
func (this *CatchBugs) AdmitDefeat(roomid string, uid string) (err error) {
|
||||
var (
|
||||
room *Room
|
||||
)
|
||||
if room, err = this.rooms.queryRoom(roomid); err != nil {
|
||||
return
|
||||
}
|
||||
err = room.PlayerOffline(uid)
|
||||
return
|
||||
}
|
||||
|
||||
@ -135,3 +135,15 @@ func (this *DColor) UserOffline(roomid string, uid string) (err error) {
|
||||
err = room.PlayerOffline(uid)
|
||||
return
|
||||
}
|
||||
|
||||
//用户离线
|
||||
func (this *DColor) AdmitDefeat(roomid string, uid string) (err error) {
|
||||
var (
|
||||
room *Room
|
||||
)
|
||||
if room, err = this.rooms.queryRoom(roomid); err != nil {
|
||||
return
|
||||
}
|
||||
err = room.PlayerOffline(uid)
|
||||
return
|
||||
}
|
||||
|
||||
62
modules/gameinvite/api_admitdefeat.go
Normal file
62
modules/gameinvite/api_admitdefeat.go
Normal file
@ -0,0 +1,62 @@
|
||||
package gameinvite
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 踢馆(熊猫武馆)
|
||||
func (this *apiComp) AdmitDefeatCheck(session comm.IUserSession, req *pb.GameInviteAdmitDefeatReq) (errdata *pb.ErrorData) {
|
||||
if req.Roomid == "" {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) AdmitDefeat(session comm.IUserSession, req *pb.GameInviteAdmitDefeatReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
err error
|
||||
)
|
||||
if errdata = this.AdmitDefeatCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
switch req.Gtype {
|
||||
case 1:
|
||||
|
||||
case 2:
|
||||
if err = this.module.caninerabbit.AdmitDefeat(req.Roomid, session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
break
|
||||
case 3:
|
||||
if err = this.module.dcolor.AdmitDefeat(req.Roomid, session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
break
|
||||
case 4:
|
||||
if err = this.module.catchBugs.AdmitDefeat(req.Roomid, session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
break
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "admitdefeat", &pb.GameInviteAdmitDefeatResp{})
|
||||
return
|
||||
}
|
||||
@ -5,6 +5,7 @@ import (
|
||||
"go_dreamfactory/lego/base"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
/*
|
||||
@ -63,3 +64,23 @@ func (this *IsLand) Start() (err error) {
|
||||
this.battle = module.(comm.IBattle)
|
||||
return
|
||||
}
|
||||
|
||||
func (this *IsLand) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
info *pb.DBIsland
|
||||
err error
|
||||
)
|
||||
|
||||
if info, err = this.model.getmodel(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
info.Vip = true
|
||||
this.model.Change(session.GetUserId(), map[string]interface{}{
|
||||
"vip": info.Vip,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq)
|
||||
if errdata = this.DeliveryCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
if conf, err = this.module.configure.getGameRecharge(order.Bpoints); err != nil {
|
||||
if conf, err = this.module.configure.getGameRecharge(req.BillingPoints); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Message: err.Error(),
|
||||
|
||||
@ -35,6 +35,7 @@ type Pay struct {
|
||||
shopcenter comm.IPayDelivery //购物中心
|
||||
addrecharge comm.IAddrecharge //累充系统
|
||||
pushgiftbag comm.IPushgiftbag //推送礼包
|
||||
island comm.IIsland //海岛战令
|
||||
configure *configureComp
|
||||
}
|
||||
|
||||
@ -76,6 +77,10 @@ func (this *Pay) Start() (err error) {
|
||||
return
|
||||
}
|
||||
this.pushgiftbag = module.(comm.IPushgiftbag)
|
||||
if module, err = this.service.GetModule(comm.ModuleIsLand); err != nil {
|
||||
return
|
||||
}
|
||||
this.island = module.(comm.IIsland)
|
||||
this.service.RegisterFunctionName(string(comm.Rpc_ModulePayDelivery), this.Rpc_ModulePayDelivery)
|
||||
return
|
||||
}
|
||||
@ -194,6 +199,12 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
|
||||
return
|
||||
}
|
||||
break
|
||||
case pb.DBPayType_IsLandBattlePass:
|
||||
if errdata, items = this.island.Delivery(session, order.Pid); errdata != nil {
|
||||
reply.Code = errdata.Code
|
||||
return
|
||||
}
|
||||
break
|
||||
}
|
||||
this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分
|
||||
for _, v := range res {
|
||||
|
||||
@ -417,6 +417,101 @@ func (x *GameInviteQiecuonotifyPush) GetRules() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
//游戏邀请 认输请求
|
||||
type GameInviteAdmitDefeatReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Gtype int32 `protobuf:"varint,1,opt,name=gtype,proto3" json:"gtype"` //游戏类型
|
||||
Roomid string `protobuf:"bytes,2,opt,name=roomid,proto3" json:"roomid"` //房间号
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatReq) Reset() {
|
||||
*x = GameInviteAdmitDefeatReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[7]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*GameInviteAdmitDefeatReq) ProtoMessage() {}
|
||||
|
||||
func (x *GameInviteAdmitDefeatReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[7]
|
||||
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 GameInviteAdmitDefeatReq.ProtoReflect.Descriptor instead.
|
||||
func (*GameInviteAdmitDefeatReq) Descriptor() ([]byte, []int) {
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatReq) GetGtype() int32 {
|
||||
if x != nil {
|
||||
return x.Gtype
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatReq) GetRoomid() string {
|
||||
if x != nil {
|
||||
return x.Roomid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
//游戏邀请 认输请求 回应
|
||||
type GameInviteAdmitDefeatResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatResp) Reset() {
|
||||
*x = GameInviteAdmitDefeatResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[8]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *GameInviteAdmitDefeatResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*GameInviteAdmitDefeatResp) ProtoMessage() {}
|
||||
|
||||
func (x *GameInviteAdmitDefeatResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[8]
|
||||
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 GameInviteAdmitDefeatResp.ProtoReflect.Descriptor instead.
|
||||
func (*GameInviteAdmitDefeatResp) Descriptor() ([]byte, []int) {
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{8}
|
||||
}
|
||||
|
||||
//游戏邀请离线请求
|
||||
type RPC_GameInviteOfflineReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -431,7 +526,7 @@ type RPC_GameInviteOfflineReq struct {
|
||||
func (x *RPC_GameInviteOfflineReq) Reset() {
|
||||
*x = RPC_GameInviteOfflineReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[7]
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[9]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -444,7 +539,7 @@ func (x *RPC_GameInviteOfflineReq) String() string {
|
||||
func (*RPC_GameInviteOfflineReq) ProtoMessage() {}
|
||||
|
||||
func (x *RPC_GameInviteOfflineReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[7]
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[9]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -457,7 +552,7 @@ func (x *RPC_GameInviteOfflineReq) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use RPC_GameInviteOfflineReq.ProtoReflect.Descriptor instead.
|
||||
func (*RPC_GameInviteOfflineReq) Descriptor() ([]byte, []int) {
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{7}
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{9}
|
||||
}
|
||||
|
||||
func (x *RPC_GameInviteOfflineReq) GetGtype() int32 {
|
||||
@ -491,7 +586,7 @@ type RPC_GameInviteOfflineResp struct {
|
||||
func (x *RPC_GameInviteOfflineResp) Reset() {
|
||||
*x = RPC_GameInviteOfflineResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[8]
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[10]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -504,7 +599,7 @@ func (x *RPC_GameInviteOfflineResp) String() string {
|
||||
func (*RPC_GameInviteOfflineResp) ProtoMessage() {}
|
||||
|
||||
func (x *RPC_GameInviteOfflineResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[8]
|
||||
mi := &file_gameinvite_gameinvite_msg_proto_msgTypes[10]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -517,7 +612,7 @@ func (x *RPC_GameInviteOfflineResp) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use RPC_GameInviteOfflineResp.ProtoReflect.Descriptor instead.
|
||||
func (*RPC_GameInviteOfflineResp) Descriptor() ([]byte, []int) {
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{8}
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescGZIP(), []int{10}
|
||||
}
|
||||
|
||||
var File_gameinvite_gameinvite_msg_proto protoreflect.FileDescriptor
|
||||
@ -558,16 +653,22 @@ var file_gameinvite_gameinvite_msg_proto_rawDesc = []byte{
|
||||
0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72,
|
||||
0x75, 0x6c, 0x65, 0x73, 0x22, 0x60, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x5f, 0x47, 0x61, 0x6d, 0x65,
|
||||
0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71,
|
||||
0x75, 0x6c, 0x65, 0x73, 0x22, 0x48, 0x0a, 0x18, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69,
|
||||
0x74, 0x65, 0x41, 0x64, 0x6d, 0x69, 0x74, 0x44, 0x65, 0x66, 0x65, 0x61, 0x74, 0x52, 0x65, 0x71,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x67, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x67, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x6f, 0x66, 0x66, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
|
||||
0x6f, 0x66, 0x66, 0x75, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f, 0x47, 0x61,
|
||||
0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x52,
|
||||
0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b,
|
||||
0x0a, 0x19, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x41, 0x64, 0x6d, 0x69,
|
||||
0x74, 0x44, 0x65, 0x66, 0x65, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x18, 0x52,
|
||||
0x50, 0x43, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x66, 0x66,
|
||||
0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x74, 0x79, 0x70, 0x65,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a,
|
||||
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
|
||||
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x75, 0x69, 0x64, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x75, 0x69, 0x64, 0x22, 0x1b, 0x0a,
|
||||
0x19, 0x52, 0x50, 0x43, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f,
|
||||
0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -582,7 +683,7 @@ func file_gameinvite_gameinvite_msg_proto_rawDescGZIP() []byte {
|
||||
return file_gameinvite_gameinvite_msg_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_gameinvite_gameinvite_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
|
||||
var file_gameinvite_gameinvite_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
|
||||
var file_gameinvite_gameinvite_msg_proto_goTypes = []interface{}{
|
||||
(*GameInviteQiecuoReq)(nil), // 0: GameInviteQiecuoReq
|
||||
(*GameInviteQiecuoResp)(nil), // 1: GameInviteQiecuoResp
|
||||
@ -591,12 +692,14 @@ var file_gameinvite_gameinvite_msg_proto_goTypes = []interface{}{
|
||||
(*GameInviteRefuseReq)(nil), // 4: GameInviteRefuseReq
|
||||
(*GameInviteRefuseResp)(nil), // 5: GameInviteRefuseResp
|
||||
(*GameInviteQiecuonotifyPush)(nil), // 6: GameInviteQiecuonotifyPush
|
||||
(*RPC_GameInviteOfflineReq)(nil), // 7: RPC_GameInviteOfflineReq
|
||||
(*RPC_GameInviteOfflineResp)(nil), // 8: RPC_GameInviteOfflineResp
|
||||
(*BaseUserInfo)(nil), // 9: BaseUserInfo
|
||||
(*GameInviteAdmitDefeatReq)(nil), // 7: GameInviteAdmitDefeatReq
|
||||
(*GameInviteAdmitDefeatResp)(nil), // 8: GameInviteAdmitDefeatResp
|
||||
(*RPC_GameInviteOfflineReq)(nil), // 9: RPC_GameInviteOfflineReq
|
||||
(*RPC_GameInviteOfflineResp)(nil), // 10: RPC_GameInviteOfflineResp
|
||||
(*BaseUserInfo)(nil), // 11: BaseUserInfo
|
||||
}
|
||||
var file_gameinvite_gameinvite_msg_proto_depIdxs = []int32{
|
||||
9, // 0: GameInviteQiecuonotifyPush.user:type_name -> BaseUserInfo
|
||||
11, // 0: GameInviteQiecuonotifyPush.user:type_name -> BaseUserInfo
|
||||
1, // [1:1] is the sub-list for method output_type
|
||||
1, // [1:1] is the sub-list for method input_type
|
||||
1, // [1:1] is the sub-list for extension type_name
|
||||
@ -696,7 +799,7 @@ func file_gameinvite_gameinvite_msg_proto_init() {
|
||||
}
|
||||
}
|
||||
file_gameinvite_gameinvite_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*RPC_GameInviteOfflineReq); i {
|
||||
switch v := v.(*GameInviteAdmitDefeatReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -708,6 +811,30 @@ func file_gameinvite_gameinvite_msg_proto_init() {
|
||||
}
|
||||
}
|
||||
file_gameinvite_gameinvite_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*GameInviteAdmitDefeatResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_gameinvite_gameinvite_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*RPC_GameInviteOfflineReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_gameinvite_gameinvite_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*RPC_GameInviteOfflineResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -726,7 +853,7 @@ func file_gameinvite_gameinvite_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_gameinvite_gameinvite_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 9,
|
||||
NumMessages: 11,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -13,9 +13,13 @@ import "errors"
|
||||
type GameTDBuffData struct {
|
||||
Id int32
|
||||
BuffType int32
|
||||
TriggerPro int32
|
||||
Describe string
|
||||
OverlayType int32
|
||||
EffectType []int32
|
||||
Value []int32
|
||||
TargetBuffId int32
|
||||
EffectRange float32
|
||||
MaxLayer int32
|
||||
LayerEffectType []int32
|
||||
LayerValue []int32
|
||||
@ -33,7 +37,9 @@ func (*GameTDBuffData) GetTypeId() int32 {
|
||||
func (_v *GameTDBuffData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buff_type"].(float64); !_ok_ { err = errors.New("buff_type error"); return }; _v.BuffType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_pro"].(float64); !_ok_ { err = errors.New("trigger_pro error"); return }; _v.TriggerPro = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["overlay_type"].(float64); !_ok_ { err = errors.New("overlay_type error"); return }; _v.OverlayType = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
@ -62,6 +68,8 @@ func (_v *GameTDBuffData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["target_buffId"].(float64); !_ok_ { err = errors.New("target_buffId error"); return }; _v.TargetBuffId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["effect_Range"].(float64); !_ok_ { err = errors.New("effect_Range error"); return }; _v.EffectRange = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_layer"].(float64); !_ok_ { err = errors.New("max_layer error"); return }; _v.MaxLayer = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
@ -25,6 +25,8 @@ type GameTDWeaponData struct {
|
||||
Num int32
|
||||
ExplosionRange float32
|
||||
Catapult int32
|
||||
SelfBuff []int32
|
||||
TargetBuff []int32
|
||||
Pro int32
|
||||
ExplosionEffect string
|
||||
}
|
||||
@ -50,6 +52,34 @@ func (_v *GameTDWeaponData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["explosion_Range"].(float64); !_ok_ { err = errors.New("explosion_Range error"); return }; _v.ExplosionRange = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["catapult"].(float64); !_ok_ { err = errors.New("catapult error"); return }; _v.Catapult = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["self_buff"].([]interface{}); !_ok_ { err = errors.New("self_buff error"); return }
|
||||
|
||||
_v.SelfBuff = 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.SelfBuff = append(_v.SelfBuff, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["target_buff"].([]interface{}); !_ok_ { err = errors.New("target_buff error"); return }
|
||||
|
||||
_v.TargetBuff = 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.TargetBuff = append(_v.TargetBuff, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.ExplosionEffect, _ok_ = _buf["explosion_effect"].(string); !_ok_ { err = errors.New("explosion_effect error"); return } }
|
||||
return
|
||||
|
||||
@ -12,13 +12,15 @@ import "errors"
|
||||
|
||||
type GameTDWeaponSkillData struct {
|
||||
SkillId int32
|
||||
SkillTriggerType int32
|
||||
Icon string
|
||||
Name string
|
||||
Describe string
|
||||
TriggerType int32
|
||||
TriggerPro int32
|
||||
Skilltype []int32
|
||||
Value []int32
|
||||
TargetBuffId int32
|
||||
SelfBuff []int32
|
||||
TargetBuff []int32
|
||||
Maxlv int32
|
||||
Pro int32
|
||||
}
|
||||
@ -31,11 +33,10 @@ func (*GameTDWeaponSkillData) GetTypeId() int32 {
|
||||
|
||||
func (_v *GameTDWeaponSkillData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_triggerType"].(float64); !_ok_ { err = errors.New("skill_triggerType error"); return }; _v.SkillTriggerType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_type"].(float64); !_ok_ { err = errors.New("trigger_type error"); return }; _v.TriggerType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_pro"].(float64); !_ok_ { err = errors.New("trigger_pro error"); return }; _v.TriggerPro = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
@ -64,6 +65,35 @@ func (_v *GameTDWeaponSkillData)Deserialize(_buf map[string]interface{}) (err er
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["target_buffId"].(float64); !_ok_ { err = errors.New("target_buffId error"); return }; _v.TargetBuffId = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["self_buff"].([]interface{}); !_ok_ { err = errors.New("self_buff error"); return }
|
||||
|
||||
_v.SelfBuff = 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.SelfBuff = append(_v.SelfBuff, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["target_buff"].([]interface{}); !_ok_ { err = errors.New("target_buff error"); return }
|
||||
|
||||
_v.TargetBuff = 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.TargetBuff = append(_v.TargetBuff, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxlv"].(float64); !_ok_ { err = errors.New("maxlv error"); return }; _v.Maxlv = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) }
|
||||
return
|
||||
|
||||
@ -13,6 +13,7 @@ import "errors"
|
||||
type GameTreasureMapData struct {
|
||||
Id int32
|
||||
Pic string
|
||||
Type int32
|
||||
Unlock []*Gameatn
|
||||
Name string
|
||||
Explain string
|
||||
@ -28,6 +29,7 @@ func (*GameTreasureMapData) GetTypeId() int32 {
|
||||
func (_v *GameTreasureMapData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Pic, _ok_ = _buf["pic"].(string); !_ok_ { err = errors.New("pic error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
|
||||
Loading…
Reference in New Issue
Block a user