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

This commit is contained in:
meixiongfeng 2023-06-26 14:49:33 +08:00
commit 081657a4b4
89 changed files with 77226 additions and 38256 deletions

View File

@ -5,9 +5,14 @@
"active": 40,
"reword": [
{
"a": "item",
"t": "17020001",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -19,9 +24,14 @@
"active": 80,
"reword": [
{
"a": "item",
"t": "10000003",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -33,9 +43,14 @@
"active": 120,
"reword": [
{
"a": "item",
"t": "17020001",
"n": 3
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -47,9 +62,14 @@
"active": 160,
"reword": [
{
"a": "item",
"t": "10000003",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",

View File

@ -5,8 +5,7 @@
"open_value": 6,
"BattleReadyID": 110,
"monsterformat_id": [
801010,
301027
800005
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -41,7 +40,7 @@
"open_value": 8,
"BattleReadyID": 110,
"monsterformat_id": [
101021
800006
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -76,7 +75,7 @@
"open_value": 10,
"BattleReadyID": 110,
"monsterformat_id": [
101031
800007
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -111,7 +110,7 @@
"open_value": 12,
"BattleReadyID": 110,
"monsterformat_id": [
101032
800008
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -146,7 +145,7 @@
"open_value": 14,
"BattleReadyID": 110,
"monsterformat_id": [
101041
801005
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -181,7 +180,7 @@
"open_value": 16,
"BattleReadyID": 110,
"monsterformat_id": [
101041
801006
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -216,7 +215,7 @@
"open_value": 18,
"BattleReadyID": 110,
"monsterformat_id": [
101041
801007
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -251,7 +250,7 @@
"open_value": 20,
"BattleReadyID": 110,
"monsterformat_id": [
101041
801008
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -286,7 +285,7 @@
"open_value": 22,
"BattleReadyID": 110,
"monsterformat_id": [
101041
802005
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -321,7 +320,7 @@
"open_value": 24,
"BattleReadyID": 110,
"monsterformat_id": [
101041
802006
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -356,7 +355,7 @@
"open_value": 27,
"BattleReadyID": 110,
"monsterformat_id": [
101041
802007
],
"stroy_id_front": 201,
"stroy_id_after": 201,
@ -391,7 +390,7 @@
"open_value": 30,
"BattleReadyID": 110,
"monsterformat_id": [
101041
802008
],
"stroy_id_front": 201,
"stroy_id_after": 201,

View File

@ -2,97 +2,97 @@
{
"id": 1,
"lv_id": 1,
"monsterformat_id": 101011,
"monsterformat_id": 800001,
"weight": 1000
},
{
"id": 2,
"lv_id": 1,
"monsterformat_id": 101021,
"monsterformat_id": 800002,
"weight": 1000
},
{
"id": 3,
"lv_id": 2,
"monsterformat_id": 101031,
"monsterformat_id": 800003,
"weight": 1000
},
{
"id": 4,
"lv_id": 2,
"monsterformat_id": 101032,
"monsterformat_id": 800004,
"weight": 1000
},
{
"id": 5,
"lv_id": 3,
"monsterformat_id": 101041,
"monsterformat_id": 800005,
"weight": 1000
},
{
"id": 6,
"lv_id": 3,
"monsterformat_id": 101042,
"monsterformat_id": 800006,
"weight": 1000
},
{
"id": 7,
"lv_id": 4,
"monsterformat_id": 101051,
"monsterformat_id": 801001,
"weight": 1000
},
{
"id": 8,
"lv_id": 4,
"monsterformat_id": 101052,
"monsterformat_id": 801002,
"weight": 1000
},
{
"id": 9,
"lv_id": 5,
"monsterformat_id": 101061,
"monsterformat_id": 801003,
"weight": 1000
},
{
"id": 10,
"lv_id": 5,
"monsterformat_id": 101062,
"monsterformat_id": 801004,
"weight": 1000
},
{
"id": 11,
"lv_id": 6,
"monsterformat_id": 101071,
"monsterformat_id": 801005,
"weight": 1000
},
{
"id": 12,
"lv_id": 6,
"monsterformat_id": 101072,
"monsterformat_id": 801006,
"weight": 1000
},
{
"id": 13,
"lv_id": 7,
"monsterformat_id": 101081,
"monsterformat_id": 802001,
"weight": 1000
},
{
"id": 14,
"lv_id": 7,
"monsterformat_id": 101082,
"monsterformat_id": 802002,
"weight": 1000
},
{
"id": 15,
"lv_id": 8,
"monsterformat_id": 101091,
"monsterformat_id": 802003,
"weight": 1000
},
{
"id": 16,
"lv_id": 8,
"monsterformat_id": 101092,
"monsterformat_id": 802004,
"weight": 1000
}
]

View File

@ -9,6 +9,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -25,6 +26,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -41,6 +43,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -57,6 +60,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -73,6 +77,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -89,6 +94,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -105,6 +111,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -121,6 +128,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -137,6 +145,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -153,6 +162,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -169,6 +179,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -185,6 +196,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -201,6 +213,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -217,6 +230,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -233,6 +247,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -249,6 +264,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -265,6 +281,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -281,6 +298,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -297,6 +315,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -313,6 +332,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -329,6 +349,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -345,6 +366,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -361,6 +383,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -377,6 +400,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -393,6 +417,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -409,6 +434,7 @@
],
"disableAiCamera": 1,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -425,6 +451,7 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
@ -441,12 +468,10 @@
],
"disableAiCamera": 0,
"DefaultHero": 0,
"DisableHero": [
"25001",
"24002",
"34006",
"14003"
"ChoseHero": [
"44004"
],
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,

View File

@ -11102,7 +11102,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_483",
"text": "武馆派遣{0}次"
"text": "武馆功夫陪练{0}次"
},
"type": 186,
"valid": 0,
@ -11124,7 +11124,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_484",
"text": "武馆派遣{0}次"
"text": "武馆功夫陪练{0}次"
},
"type": 186,
"valid": 0,
@ -11196,7 +11196,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_487",
"text": "武馆派遣{0}次"
"text": "武馆功夫陪练{0}次"
},
"type": 186,
"valid": 0,
@ -16830,7 +16830,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_720",
"text": "武馆派遣{0}次"
"text": "武馆功夫陪练{0}次"
},
"type": 186,
"valid": 0,
@ -16900,7 +16900,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_723",
"text": "击退恐惧灵小怪"
"text": "击退豺狼小怪"
},
"type": 70,
"valid": 0,
@ -17160,14 +17160,14 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_734",
"text": "给阿宝穿5件装备"
"text": "给骇客蛛穿5件装备"
},
"type": 5,
"valid": 0,
"NPC": -102,
"value": 5,
"filter": [
25001
44004
],
"filter2": [
"英雄ID",
@ -17373,7 +17373,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_743",
"text": "击败恐惧灵"
"text": "击退豺狼小怪"
},
"type": 70,
"valid": 0,
@ -17397,7 +17397,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_744",
"text": "和梦魇对决"
"text": "和漆黑对决"
},
"type": 70,
"valid": 0,
@ -18020,7 +18020,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_770",
"text": "战斗16"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18044,7 +18044,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_771",
"text": "维京远征boss2难度1"
"text": "冰霜泰坦难度1"
},
"type": 73,
"valid": 0,
@ -18093,7 +18093,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_773",
"text": "强化装备"
"text": "6件装备+6"
},
"type": 43,
"valid": 0,
@ -18117,7 +18117,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_774",
"text": "主线【3-1】-【3-4】"
"text": "冒险3-4通关"
},
"type": 61,
"valid": 0,
@ -18141,7 +18141,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_775",
"text": "装备副本boss2难度2刷1次"
"text": "冰霜泰坦难度2"
},
"type": 73,
"valid": 0,
@ -18166,7 +18166,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_776",
"text": "主线【3-5】-【3-8】"
"text": "冒险3-8通关"
},
"type": 61,
"valid": 0,
@ -18262,7 +18262,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_780",
"text": "战斗17"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18286,7 +18286,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_781",
"text": "战斗18"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18310,7 +18310,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_782",
"text": "战斗19"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18334,7 +18334,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_783",
"text": "装备副本boss3难度1(开支线,打狩猎)"
"text": "森林泰坦难度1"
},
"type": 73,
"valid": 0,
@ -18405,7 +18405,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_786",
"text": "战斗20"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18429,7 +18429,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_787",
"text": "战斗21"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18477,7 +18477,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_789",
"text": "主线【4-1】-【4-8】"
"text": "冒险4-8通关"
},
"type": 61,
"valid": 0,
@ -18501,7 +18501,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_790",
"text": "装备副本boss3难度4刷1次"
"text": "森林泰坦难度2"
},
"type": 73,
"valid": 0,
@ -18509,7 +18509,7 @@
"value": 1,
"filter": [
3,
4
2
],
"filter2": [
"boss类型",
@ -18596,7 +18596,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_794",
"text": "关卡【5-1】-【5-8】"
"text": "冒险5-8通关"
},
"type": 61,
"valid": 0,
@ -18620,7 +18620,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_795",
"text": "战斗22"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18644,7 +18644,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_796",
"text": "战斗23"
"text": "击退豺狼人"
},
"type": 70,
"valid": 0,
@ -18668,7 +18668,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_797",
"text": "穿一套+6的无极神功套装"
"text": "穿+6的无极神功套装"
},
"type": 93,
"valid": 0,
@ -18693,7 +18693,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_798",
"text": "加入公会"
"text": "加入任意公会"
},
"type": 109,
"valid": 0,
@ -18715,7 +18715,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_799",
"text": "装备副本boss3难度2刷1次"
"text": "森林泰坦难度3"
},
"type": 73,
"valid": 0,
@ -18723,7 +18723,7 @@
"value": 1,
"filter": [
3,
2
3
],
"filter2": [
"boss类型",
@ -18740,7 +18740,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_800",
"text": "装备副本boss3难度5刷2次"
"text": "森林泰坦难度4"
},
"type": 73,
"valid": 0,
@ -18748,7 +18748,7 @@
"value": 1,
"filter": [
3,
5
4
],
"filter2": [
"boss类型",
@ -18809,7 +18809,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_803",
"text": "关卡6-6"
"text": "冒险6-6通关"
},
"type": 61,
"valid": 0,
@ -18857,7 +18857,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_805",
"text": "竞技场3胜"
"text": "竞技场3胜"
},
"type": 131,
"valid": 0,
@ -18879,15 +18879,15 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_806",
"text": "装备副本boss4难度2刷1次"
"text": "森林泰坦难度5"
},
"type": 73,
"valid": 0,
"NPC": 10804,
"value": 1,
"filter": [
4,
2
3,
5
],
"filter2": [
"boss类型",
@ -18926,7 +18926,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_808",
"text": "关卡7-6"
"text": "冒险7-6通关"
},
"type": 61,
"valid": 0,
@ -18998,7 +18998,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_811",
"text": "关卡8-6"
"text": "冒险8-6通关"
},
"type": 61,
"valid": 0,
@ -19022,15 +19022,15 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_812",
"text": "装备副本boss4难度4刷1次"
"text": "森林泰坦难度6"
},
"type": 73,
"valid": 0,
"NPC": 10864,
"value": 1,
"filter": [
4,
4
3,
6
],
"filter2": [
"boss类型",
@ -19071,7 +19071,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_814",
"text": "关卡9-6"
"text": "冒险9-6通关"
},
"type": 61,
"valid": 0,
@ -19117,7 +19117,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_816",
"text": "关卡10-6"
"text": "冒险10-6通关"
},
"type": 61,
"valid": 0,
@ -19141,15 +19141,15 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_817",
"text": "装备副本boss4难度6刷1次"
"text": "森林泰坦难度7"
},
"type": 73,
"valid": 0,
"NPC": 10914,
"value": 1,
"filter": [
4,
6
3,
7
],
"filter2": [
"boss类型",
@ -19190,7 +19190,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_819",
"text": "关卡11-6"
"text": "冒险11-6通关"
},
"type": 61,
"valid": 0,
@ -19236,7 +19236,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_821",
"text": "关卡12-6"
"text": "冒险12-6通关"
},
"type": 61,
"valid": 0,
@ -19260,7 +19260,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_822",
"text": "主线困难1-3"
"text": "冒险关卡困难1-3"
},
"type": 61,
"valid": 0,
@ -19284,7 +19284,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_823",
"text": "主线困难1-6"
"text": "冒险关卡困难1-6"
},
"type": 61,
"valid": 0,
@ -19308,7 +19308,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_824",
"text": "主线困难2-3"
"text": "冒险关卡困难2-3"
},
"type": 61,
"valid": 0,
@ -19332,7 +19332,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_825",
"text": "主线困难2-6"
"text": "冒险关卡困难2-6"
},
"type": 61,
"valid": 0,
@ -19356,7 +19356,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_826",
"text": "主线困难3-3"
"text": "冒险关卡困难3-3"
},
"type": 61,
"valid": 0,
@ -19380,7 +19380,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_827",
"text": "主线困难3-6"
"text": "冒险关卡困难3-6"
},
"type": 61,
"valid": 0,
@ -19404,7 +19404,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_828",
"text": "主线困难4-3"
"text": "冒险关卡困难4-3"
},
"type": 61,
"valid": 0,
@ -19428,7 +19428,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_829",
"text": "主线困难4-6"
"text": "冒险关卡困难4-6"
},
"type": 61,
"valid": 0,
@ -19452,7 +19452,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_830",
"text": "主线困难5-3"
"text": "冒险关卡困难5-3"
},
"type": 61,
"valid": 0,
@ -19476,7 +19476,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_831",
"text": "主线困难5-6"
"text": "冒险关卡困难5-6"
},
"type": 61,
"valid": 0,
@ -19500,7 +19500,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_832",
"text": "主线困难6-3"
"text": "冒险关卡困难6-3"
},
"type": 61,
"valid": 0,
@ -19524,7 +19524,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_833",
"text": "主线困难6-6"
"text": "冒险关卡困难6-6"
},
"type": 61,
"valid": 0,
@ -19548,7 +19548,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_834",
"text": "主线困难7-3"
"text": "冒险关卡困难7-3"
},
"type": 61,
"valid": 0,
@ -19572,7 +19572,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_835",
"text": "主线困难7-6"
"text": "冒险关卡困难7-6"
},
"type": 61,
"valid": 0,
@ -19596,7 +19596,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_836",
"text": "主线困难8-3"
"text": "冒险关卡困难8-3"
},
"type": 61,
"valid": 0,
@ -19620,7 +19620,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_837",
"text": "主线困难8-6"
"text": "冒险关卡困难8-6"
},
"type": 61,
"valid": 0,
@ -19644,7 +19644,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_838",
"text": "主线困难9-3"
"text": "冒险关卡困难9-3"
},
"type": 61,
"valid": 0,
@ -19668,7 +19668,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_839",
"text": "主线困难9-6"
"text": "冒险关卡困难9-6"
},
"type": 61,
"valid": 0,
@ -19692,7 +19692,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_840",
"text": "主线困难10-3"
"text": "冒险关卡困难10-3"
},
"type": 61,
"valid": 0,
@ -19716,7 +19716,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_841",
"text": "主线困难10-6"
"text": "冒险关卡困难10-6"
},
"type": 61,
"valid": 0,
@ -19740,7 +19740,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_842",
"text": "主线困难11-3"
"text": "冒险关卡困难11-3"
},
"type": 61,
"valid": 0,
@ -19764,7 +19764,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_843",
"text": "主线困难11-6"
"text": "冒险关卡困难11-6"
},
"type": 61,
"valid": 0,
@ -19788,7 +19788,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_844",
"text": "主线困难12-3"
"text": "冒险关卡困难12-3"
},
"type": 61,
"valid": 0,
@ -19812,7 +19812,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_845",
"text": "主线困难12-6"
"text": "冒险关卡困难12-6"
},
"type": 61,
"valid": 0,
@ -19828,6 +19828,312 @@
"0"
]
},
{
"id": 13000001,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_846",
"text": "本周竞技场挑战{0}次"
},
"type": 130,
"valid": 10,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000002,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_847",
"text": "本周竞技场挑战{0}次"
},
"type": 130,
"valid": 30,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000003,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_848",
"text": "本周竞技场挑战{0}次"
},
"type": 130,
"valid": 50,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000004,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_849",
"text": "本周竞技场胜利{0}次"
},
"type": 130,
"valid": 10,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000005,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_850",
"text": "本周竞技场胜利{0}次"
},
"type": 130,
"valid": 20,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000006,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_851",
"text": "本周竞技场胜利{0}次"
},
"type": 130,
"valid": 30,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000007,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_852",
"text": "本周累计经验副本消耗{0}体力"
},
"type": 130,
"valid": 300,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000008,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_853",
"text": "本周累计经验副本消耗{0}体力"
},
"type": 130,
"valid": 600,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000009,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_854",
"text": "本周累计经验副本消耗{0}体力"
},
"type": 130,
"valid": 1000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000010,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_855",
"text": "本周累计消耗{0}点金币"
},
"type": 130,
"valid": 3000000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000011,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_856",
"text": "本周累计消耗{0}点金币"
},
"type": 130,
"valid": 6000000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000012,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_857",
"text": "本周累计消耗{0}点金币"
},
"type": 130,
"valid": 10000000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000013,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_858",
"text": "本周累计装备副本消耗{0}体力"
},
"type": 130,
"valid": 300,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000014,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_859",
"text": "本周累计装备副本消耗{0}体力"
},
"type": 130,
"valid": 600,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000015,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_860",
"text": "本周累计装备副本消耗{0}体力"
},
"type": 130,
"valid": 1000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000016,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_861",
"text": "本周累计回响副本消耗{0}体力"
},
"type": 130,
"valid": 300,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000017,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_862",
"text": "本周累计回响副本消耗{0}体力"
},
"type": 130,
"valid": 600,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 13000018,
"rtype": 1,
"ctype": 4,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_863",
"text": "本周累计回响副本消耗{0}体力"
},
"type": 130,
"valid": 1000,
"NPC": 0,
"value": 0,
"filter": [],
"filter2": []
},
{
"id": 50000001,
"rtype": 2,
@ -19835,7 +20141,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_846",
"key": "buried_buried_condi_tasktxt_864",
"text": "使用好友助战守护者1次"
},
"type": 12,
@ -19852,7 +20158,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_847",
"key": "buried_buried_condi_tasktxt_865",
"text": "进行3次普通招募"
},
"type": 18,
@ -19869,7 +20175,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_848",
"key": "buried_buried_condi_tasktxt_866",
"text": "为任意守护者提升5级"
},
"type": 24,
@ -19886,7 +20192,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_849",
"key": "buried_buried_condi_tasktxt_867",
"text": "强化任意装备成功6次"
},
"type": 47,
@ -19903,7 +20209,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_850",
"key": "buried_buried_condi_tasktxt_868",
"text": "消费500000金币"
},
"type": 68,
@ -19920,7 +20226,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_851",
"key": "buried_buried_condi_tasktxt_869",
"text": "消费300钻石"
},
"type": 104,
@ -19937,7 +20243,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_852",
"key": "buried_buried_condi_tasktxt_870",
"text": "完成1次功夫陪练任务"
},
"type": 186,
@ -19954,7 +20260,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_853",
"key": "buried_buried_condi_tasktxt_871",
"text": "挑战3次竞技场"
},
"type": 130,
@ -19971,7 +20277,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_854",
"key": "buried_buried_condi_tasktxt_872",
"text": "挑战3次“维京远征”副本"
},
"type": 172,
@ -19988,7 +20294,7 @@
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_855",
"key": "buried_buried_condi_tasktxt_873",
"text": "挑战3次“狩猎”副本"
},
"type": 200,

View File

@ -86,7 +86,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_5",
"text": "<font color=#ffc73f>【全服】%v</font> 经过不懈的努力,将 %v 强化至+13"
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力,将{1}强化至+13"
},
"data": 13,
"data2": 0,
@ -101,7 +101,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_6",
"text": "<font color=#ffc73f>【全服】%v</font> 经过不懈的努力,将 %v 强化至+14"
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力,将{1}强化至+14"
},
"data": 14,
"data2": 0,
@ -116,7 +116,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_7",
"text": "<font color=#ffc73f>【全服】%v</font> 经过不懈的努力,将 %v 强化至+15"
"text": "<font color=#ffc73f>【全服】{0}</font> 经过不懈的努力,将 {1} 强化至+15"
},
"data": 15,
"data2": 0,
@ -131,7 +131,7 @@
"datatype": 4,
"text": {
"key": "chat_system_text_8",
"text": "<font color=#ffc73f>【全服】%v</font> 突破爬塔100层"
"text": "<font color=#ffc73f>【全服】{0}</font> 突破爬塔100层"
},
"data": 100,
"data2": 0,
@ -161,7 +161,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_10",
"text": "【传闻】%v通关了赛季塔50层"
"text": "【传闻】{0}通关了赛季塔50层"
},
"data": 50,
"data2": 0,
@ -176,7 +176,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_11",
"text": "【传闻】%v已经%v培养至60级"
"text": "【传闻】{0}已经{1}培养至60级"
},
"data": 60,
"data2": 0,
@ -191,7 +191,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_12",
"text": "【传闻】%v已经%v培养至6星"
"text": "【传闻】{0}已经{1}培养至6星"
},
"data": 5,
"data2": 0,
@ -206,7 +206,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_13",
"text": "【传闻】%v已经%v技能培养至满级!"
"text": "【传闻】{0}已经{1}技能培养至满级!"
},
"data": 5,
"data2": 0,
@ -221,7 +221,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_14",
"text": "【传闻】%v已经%v回响至满级!"
"text": "【传闻】{0}已经{1}回响至满级!"
},
"data": 5,
"data2": 0,
@ -236,7 +236,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_15",
"text": "【传闻】%v已经%v觉醒至满级!"
"text": "【传闻】{0}已经{1}觉醒至满级!"
},
"data": 5,
"data2": 0,
@ -251,7 +251,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_16",
"text": "【传闻】%v已经达到了60级!"
"text": "【传闻】{0}已经达到了60级!"
},
"data": 60,
"data2": 0,
@ -266,7 +266,7 @@
"datatype": 3,
"text": {
"key": "chat_system_text_17",
"text": "【传闻】%v在招募中获得了v%!"
"text": "【传闻】{0}在招募中获得了{1}!"
},
"data": 5,
"data2": 0,
@ -281,7 +281,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_18",
"text": "【传闻】%v通关了维京远征火焰泰坦难度10"
"text": "【传闻】{0}通关了维京远征火焰泰坦难度10"
},
"data": 10,
"data2": 1,
@ -296,7 +296,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_19",
"text": "【传闻】%v通关了维京远征冰霜泰坦难度10"
"text": "【传闻】{0}通关了维京远征冰霜泰坦难度10"
},
"data": 10,
"data2": 2,
@ -311,7 +311,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_20",
"text": "【传闻】%v通关了维京远征森林泰坦难度10"
"text": "【传闻】{0}通关了维京远征森林泰坦难度10"
},
"data": 10,
"data2": 3,
@ -326,7 +326,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_21",
"text": "【传闻】%v通关了维京远征冰霜泰坦武器难度10"
"text": "【传闻】{0}通关了维京远征冰霜泰坦武器难度10"
},
"data": 10,
"data2": 11,
@ -341,7 +341,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_22",
"text": "【传闻】%v通关了维京远征森林泰坦饰品难度10"
"text": "【传闻】{0}通关了维京远征森林泰坦饰品难度10"
},
"data": 10,
"data2": 12,
@ -356,7 +356,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_23",
"text": "【传闻】%v通关了狩猎巨型猩猩难度10"
"text": "【传闻】{0}通关了狩猎巨型猩猩难度10"
},
"data": 10,
"data2": 1,
@ -371,7 +371,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_24",
"text": "【传闻】%v通关了狩猎火龙难度10"
"text": "【传闻】{0}通关了狩猎火龙难度10"
},
"data": 10,
"data2": 2,
@ -386,7 +386,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_25",
"text": "【传闻】%v通关了狩猎大厨难度10"
"text": "【传闻】{0}通关了狩猎大厨难度10"
},
"data": 10,
"data2": 3,
@ -401,7 +401,7 @@
"datatype": 1,
"text": {
"key": "chat_system_text_26",
"text": "【传闻】%v通关了狩猎太空海星难度10"
"text": "【传闻】{0}通关了狩猎太空海星难度10"
},
"data": 10,
"data2": 4,

View File

@ -2,51 +2,101 @@
{
"lv": 1,
"probability": [
60,
40,
0,
0
830,
150,
15,
5
],
"Upgrade": 0
},
{
"lv": 2,
"probability": [
60,
760,
200,
30,
10,
0
10
],
"Upgrade": 1
"Upgrade": 5
},
{
"lv": 3,
"probability": [
50,
30,
15,
5
690,
250,
45,
15
],
"Upgrade": 2
"Upgrade": 10
},
{
"lv": 4,
"probability": [
45,
25,
20,
10
620,
300,
60,
20
],
"Upgrade": 3
"Upgrade": 15
},
{
"lv": 5,
"probability": [
40,
30,
15,
15
550,
350,
75,
25
],
"Upgrade": 4
"Upgrade": 20
},
{
"lv": 6,
"probability": [
480,
400,
90,
30
],
"Upgrade": 25
},
{
"lv": 7,
"probability": [
410,
450,
105,
35
],
"Upgrade": 30
},
{
"lv": 8,
"probability": [
340,
500,
120,
40
],
"Upgrade": 35
},
{
"lv": 9,
"probability": [
270,
550,
135,
45
],
"Upgrade": 40
},
{
"lv": 10,
"probability": [
200,
600,
150,
50
],
"Upgrade": 45
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,32 +1,19 @@
[
{
"key": 1,
"recruitment_type": [
{
"k": 3,
"s": "base_pool1"
},
{
"k": 6,
"s": "base_pool1"
},
{
"k": 9,
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 0,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool10",
"n4pool": "base_pool11",
"n5pool": "base_pool12",
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool20003",
"p4pool": "pro_pool20004",
"p5pool": "pro_pool20005",
"n3pool": "base_pool20003",
"n4pool": "base_pool20004",
"n5pool": "base_pool20005",
"baodi4": 10,
"baidi5": 90,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
@ -36,162 +23,181 @@
"n": 1
}
],
"consumeB": []
"consumeB": [
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"key": 2,
"recruitment_type": [
{
"k": 3,
"s": "base_pool1"
"k": 1,
"s": "inevitable_10001"
},
{
"k": 6,
"s": "base_pool1"
},
{
"k": 9,
"s": "base_pool1"
"k": 10,
"s": "inevitable_10010"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool10",
"n4pool": "base_pool11",
"n5pool": "base_pool12",
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool20003",
"p4pool": "pro_pool20004",
"p5pool": "pro_pool20005",
"n3pool": "base_pool20003",
"n4pool": "base_pool20004",
"n5pool": "base_pool20005",
"baodi4": 10,
"baidi5": 0,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000001",
"n": 2
"n": 1
}
],
"consumeB": []
"consumeB": [
{
"a": "attr",
"t": "diamond",
"n": 200
}
]
},
{
"key": 3,
"recruitment_type": [
{
"k": 3,
"s": "base_pool1"
},
{
"k": 6,
"s": "base_pool1"
},
{
"k": 9,
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool10",
"n4pool": "base_pool11",
"n5pool": "base_pool12",
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool30003",
"p4pool": "pro_pool30004",
"p5pool": "pro_pool30005",
"n3pool": "base_pool30003",
"n4pool": "base_pool30004",
"n5pool": "base_pool30005",
"baodi4": 10,
"baidi5": 0,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000001",
"n": 3
"t": "10000021",
"n": 1
}
],
"consumeB": []
"consumeB": [
{
"a": "item",
"t": "10000031",
"n": 10
}
]
},
{
"key": 4,
"recruitment_type": [
{
"k": 3,
"s": "base_pool1"
},
{
"k": 6,
"s": "base_pool1"
},
{
"k": 9,
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool10",
"n4pool": "base_pool11",
"n5pool": "base_pool12",
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool40003",
"p4pool": "pro_pool40004",
"p5pool": "pro_pool40005",
"n3pool": "base_pool40003",
"n4pool": "base_pool40004",
"n5pool": "base_pool40005",
"baodi4": 10,
"baidi5": 0,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000001",
"n": 4
"t": "10000022",
"n": 1
}
],
"consumeB": []
"consumeB": [
{
"a": "item",
"t": "10000032",
"n": 10
}
]
},
{
"key": 5,
"recruitment_type": [
{
"k": 3,
"s": "base_pool1"
},
{
"k": 6,
"s": "base_pool1"
},
{
"k": 9,
"s": "base_pool1"
}
],
"star3w": 900,
"star4w": 94,
"star5w": 6,
"protect": 50,
"p3pool": "base_pool7",
"p4pool": "base_pool8",
"p5pool": "base_pool9",
"n3pool": "base_pool10",
"n4pool": "base_pool11",
"n5pool": "base_pool12",
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool50003",
"p4pool": "pro_pool50004",
"p5pool": "pro_pool50005",
"n3pool": "base_pool50003",
"n4pool": "base_pool50004",
"n5pool": "base_pool50005",
"baodi4": 10,
"baidi5": 0,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000001",
"n": 5
"t": "10000023",
"n": 1
}
],
"consumeB": []
"consumeB": [
{
"a": "item",
"t": "10000033",
"n": 10
}
]
},
{
"key": 6,
"recruitment_type": [],
"star3w": 940,
"star4w": 52,
"star5w": 8,
"protect": 100,
"p3pool": "pro_pool50003",
"p4pool": "pro_pool50004",
"p5pool": "pro_pool50005",
"n3pool": "base_pool50003",
"n4pool": "base_pool50004",
"n5pool": "base_pool50005",
"baodi4": 10,
"baidi5": 100,
"etime": -1,
"permission": 1,
"consumeA": [
{
"a": "item",
"t": "10000024",
"n": 1
}
],
"consumeB": [
{
"a": "item",
"t": "10000034",
"n": 10
}
]
}
]

View File

@ -241,122 +241,162 @@
},
{
"key": 61,
"weight": 10
"weight": 0
},
{
"key": 62,
"weight": 20
"weight": 0
},
{
"key": 63,
"weight": 30
"weight": 0
},
{
"key": 64,
"weight": 40
"weight": 0
},
{
"key": 65,
"weight": 50
"weight": 0
},
{
"key": 66,
"weight": 60
"weight": 0
},
{
"key": 67,
"weight": 70
"weight": 0
},
{
"key": 68,
"weight": 80
"weight": 0
},
{
"key": 69,
"weight": 90
"weight": 0
},
{
"key": 70,
"weight": 100
"weight": 0
},
{
"key": 71,
"weight": 110
"weight": 0
},
{
"key": 72,
"weight": 120
"weight": 0
},
{
"key": 73,
"weight": 130
"weight": 0
},
{
"key": 74,
"weight": 140
"weight": 0
},
{
"key": 75,
"weight": 150
"weight": 0
},
{
"key": 76,
"weight": 160
"weight": 0
},
{
"key": 77,
"weight": 170
"weight": 0
},
{
"key": 78,
"weight": 180
"weight": 0
},
{
"key": 79,
"weight": 190
"weight": 0
},
{
"key": 80,
"weight": 200
"weight": 0
},
{
"key": 81,
"weight": 210
"weight": 2
},
{
"key": 82,
"weight": 220
"weight": 12
},
{
"key": 83,
"weight": 230
"weight": 23
},
{
"key": 84,
"weight": 240
"weight": 55
},
{
"key": 85,
"weight": 250
"weight": 127
},
{
"key": 86,
"weight": 260
"weight": 208
},
{
"key": 87,
"weight": 270
"weight": 303
},
{
"key": 88,
"weight": 280
"weight": 414
},
{
"key": 89,
"weight": 290
"weight": 546
},
{
"key": 90,
"weight": 300
"weight": 705
},
{
"key": 91,
"weight": 901
},
{
"key": 92,
"weight": 1148
},
{
"key": 93,
"weight": 1468
},
{
"key": 94,
"weight": 1903
},
{
"key": 95,
"weight": 2523
},
{
"key": 96,
"weight": 3481
},
{
"key": 97,
"weight": 5158
},
{
"key": 98,
"weight": 8848
},
{
"key": 99,
"weight": 23608
},
{
"key": 100,
"weight": 999999
}
]

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@
"n": 500
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -28,7 +28,7 @@
"n": 583
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -45,8 +45,8 @@
"n": 666
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -56,8 +56,8 @@
"star": 1,
"level": 4,
"need": [],
"bonus": 250,
"activation": true,
"bonus": 0,
"activation": false,
"probability": 1000,
"num": -1
},
@ -73,7 +73,7 @@
"n": 1000
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -90,7 +90,7 @@
"n": 1166
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -107,8 +107,8 @@
"n": 1333
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -124,8 +124,8 @@
"n": 1666
}
],
"bonus": 250,
"activation": true,
"bonus": 1333,
"activation": false,
"probability": 1000,
"num": 1
},
@ -141,7 +141,7 @@
"n": 2083
}
],
"bonus": 300,
"bonus": 1666,
"activation": false,
"probability": 850,
"num": 3
@ -158,7 +158,7 @@
"n": 2500
}
],
"bonus": 350,
"bonus": 2000,
"activation": false,
"probability": 700,
"num": 3
@ -169,7 +169,7 @@
"star": 2,
"level": 7,
"need": [],
"bonus": 400,
"bonus": 0,
"activation": false,
"probability": 600,
"num": -1
@ -186,7 +186,7 @@
"n": 2000
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -203,7 +203,7 @@
"n": 2333
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -220,8 +220,8 @@
"n": 2666
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -237,8 +237,8 @@
"n": 3333
}
],
"bonus": 250,
"activation": true,
"bonus": 1333,
"activation": false,
"probability": 1000,
"num": 1
},
@ -254,7 +254,7 @@
"n": 4166
}
],
"bonus": 300,
"bonus": 1666,
"activation": false,
"probability": 850,
"num": 3
@ -271,7 +271,7 @@
"n": 5000
}
],
"bonus": 350,
"bonus": 2000,
"activation": false,
"probability": 700,
"num": 3
@ -288,8 +288,8 @@
"n": 5833
}
],
"bonus": 400,
"activation": false,
"bonus": 2333,
"activation": true,
"probability": 600,
"num": 4
},
@ -305,8 +305,8 @@
"n": 6666
}
],
"bonus": 450,
"activation": true,
"bonus": 2666,
"activation": false,
"probability": 500,
"num": 4
},
@ -322,7 +322,7 @@
"n": 8333
}
],
"bonus": 500,
"bonus": 3000,
"activation": false,
"probability": 450,
"num": 5
@ -333,7 +333,7 @@
"star": 3,
"level": 10,
"need": [],
"bonus": 550,
"bonus": 0,
"activation": false,
"probability": 400,
"num": -1
@ -350,7 +350,7 @@
"n": 4000
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -367,7 +367,7 @@
"n": 4666
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -384,8 +384,8 @@
"n": 5333
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -401,8 +401,8 @@
"n": 6666
}
],
"bonus": 250,
"activation": true,
"bonus": 1333,
"activation": false,
"probability": 1000,
"num": 1
},
@ -418,7 +418,7 @@
"n": 8333
}
],
"bonus": 300,
"bonus": 1666,
"activation": false,
"probability": 850,
"num": 3
@ -435,7 +435,7 @@
"n": 10000
}
],
"bonus": 350,
"bonus": 2000,
"activation": false,
"probability": 700,
"num": 3
@ -452,8 +452,8 @@
"n": 11666
}
],
"bonus": 400,
"activation": false,
"bonus": 2333,
"activation": true,
"probability": 600,
"num": 4
},
@ -469,8 +469,8 @@
"n": 13333
}
],
"bonus": 450,
"activation": true,
"bonus": 2666,
"activation": false,
"probability": 500,
"num": 4
},
@ -486,7 +486,7 @@
"n": 16666
}
],
"bonus": 500,
"bonus": 3000,
"activation": false,
"probability": 450,
"num": 5
@ -503,7 +503,7 @@
"n": 88900
}
],
"bonus": 550,
"bonus": 3333,
"activation": false,
"probability": 400,
"num": 5
@ -520,8 +520,8 @@
"n": 122233
}
],
"bonus": 600,
"activation": false,
"bonus": 3666,
"activation": true,
"probability": 350,
"num": 6
},
@ -537,8 +537,8 @@
"n": 166666
}
],
"bonus": 650,
"activation": true,
"bonus": 4000,
"activation": false,
"probability": 300,
"num": 7
},
@ -548,7 +548,7 @@
"star": 4,
"level": 13,
"need": [],
"bonus": 700,
"bonus": 0,
"activation": false,
"probability": 250,
"num": -1
@ -565,7 +565,7 @@
"n": 6000
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -582,7 +582,7 @@
"n": 7000
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -599,8 +599,8 @@
"n": 8000
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -616,8 +616,8 @@
"n": 10000
}
],
"bonus": 250,
"activation": true,
"bonus": 1333,
"activation": false,
"probability": 1000,
"num": 1
},
@ -633,7 +633,7 @@
"n": 12500
}
],
"bonus": 300,
"bonus": 1666,
"activation": false,
"probability": 850,
"num": 3
@ -650,7 +650,7 @@
"n": 15000
}
],
"bonus": 350,
"bonus": 2000,
"activation": false,
"probability": 700,
"num": 3
@ -667,8 +667,8 @@
"n": 17500
}
],
"bonus": 400,
"activation": false,
"bonus": 2333,
"activation": true,
"probability": 600,
"num": 4
},
@ -684,8 +684,8 @@
"n": 20000
}
],
"bonus": 450,
"activation": true,
"bonus": 2666,
"activation": false,
"probability": 500,
"num": 4
},
@ -701,7 +701,7 @@
"n": 25000
}
],
"bonus": 500,
"bonus": 3000,
"activation": false,
"probability": 450,
"num": 5
@ -718,7 +718,7 @@
"n": 133350
}
],
"bonus": 550,
"bonus": 3333,
"activation": false,
"probability": 400,
"num": 5
@ -735,8 +735,8 @@
"n": 183350
}
],
"bonus": 600,
"activation": false,
"bonus": 3666,
"activation": true,
"probability": 350,
"num": 6
},
@ -752,8 +752,8 @@
"n": 250000
}
],
"bonus": 650,
"activation": true,
"bonus": 4000,
"activation": false,
"probability": 300,
"num": 7
},
@ -769,7 +769,7 @@
"n": 350000
}
],
"bonus": 700,
"bonus": 4333,
"activation": false,
"probability": 250,
"num": 8
@ -786,7 +786,7 @@
"n": 500000
}
],
"bonus": 750,
"bonus": 4666,
"activation": false,
"probability": 200,
"num": 9
@ -803,8 +803,8 @@
"n": 750000
}
],
"bonus": 800,
"activation": false,
"bonus": 5666,
"activation": true,
"probability": 150,
"num": 10
},
@ -814,8 +814,8 @@
"star": 5,
"level": 16,
"need": [],
"bonus": 1000,
"activation": true,
"bonus": 0,
"activation": false,
"probability": 500,
"num": -1
},
@ -831,7 +831,7 @@
"n": 12000
}
],
"bonus": 0,
"bonus": 333,
"activation": false,
"probability": 1000,
"num": 1
@ -848,7 +848,7 @@
"n": 14000
}
],
"bonus": 150,
"bonus": 666,
"activation": false,
"probability": 1000,
"num": 1
@ -865,8 +865,8 @@
"n": 16000
}
],
"bonus": 200,
"activation": false,
"bonus": 1000,
"activation": true,
"probability": 1000,
"num": 1
},
@ -882,8 +882,8 @@
"n": 20000
}
],
"bonus": 250,
"activation": true,
"bonus": 1333,
"activation": false,
"probability": 1000,
"num": 1
},
@ -899,7 +899,7 @@
"n": 25000
}
],
"bonus": 300,
"bonus": 1666,
"activation": false,
"probability": 850,
"num": 3
@ -916,7 +916,7 @@
"n": 30000
}
],
"bonus": 350,
"bonus": 2000,
"activation": false,
"probability": 700,
"num": 3
@ -933,8 +933,8 @@
"n": 35000
}
],
"bonus": 400,
"activation": false,
"bonus": 2333,
"activation": true,
"probability": 600,
"num": 4
},
@ -950,8 +950,8 @@
"n": 40000
}
],
"bonus": 450,
"activation": true,
"bonus": 2666,
"activation": false,
"probability": 500,
"num": 4
},
@ -967,7 +967,7 @@
"n": 50000
}
],
"bonus": 500,
"bonus": 3000,
"activation": false,
"probability": 450,
"num": 5
@ -984,7 +984,7 @@
"n": 266700
}
],
"bonus": 550,
"bonus": 3333,
"activation": false,
"probability": 400,
"num": 5
@ -1001,8 +1001,8 @@
"n": 366700
}
],
"bonus": 600,
"activation": false,
"bonus": 3666,
"activation": true,
"probability": 350,
"num": 6
},
@ -1018,8 +1018,8 @@
"n": 500000
}
],
"bonus": 650,
"activation": true,
"bonus": 4000,
"activation": false,
"probability": 300,
"num": 7
},
@ -1035,7 +1035,7 @@
"n": 700000
}
],
"bonus": 700,
"bonus": 4333,
"activation": false,
"probability": 250,
"num": 8
@ -1052,7 +1052,7 @@
"n": 1000000
}
],
"bonus": 750,
"bonus": 4666,
"activation": false,
"probability": 200,
"num": 9
@ -1069,8 +1069,8 @@
"n": 1500000
}
],
"bonus": 800,
"activation": false,
"bonus": 5666,
"activation": true,
"probability": 150,
"num": 10
},
@ -1080,8 +1080,8 @@
"star": 6,
"level": 16,
"need": [],
"bonus": 1000,
"activation": true,
"bonus": 0,
"activation": false,
"probability": 500,
"num": -1
},

File diff suppressed because it is too large Load Diff

View File

@ -220,6 +220,48 @@
"t": "18000004",
"n": 1
},
"Arena_buy": [
{
"a": "attr",
"t": "diamond",
"n": 100
},
{
"a": "attr",
"t": "diamond",
"n": 200
},
{
"a": "attr",
"t": "diamond",
"n": 400
},
{
"a": "attr",
"t": "diamond",
"n": 600
},
{
"a": "attr",
"t": "diamond",
"n": 800
},
{
"a": "attr",
"t": "diamond",
"n": 1000
},
{
"a": "attr",
"t": "diamond",
"n": 1200
},
{
"a": "attr",
"t": "diamond",
"n": 1400
}
],
"VikingExpedition_RecoveryTime": 144,
"cops_RecoveryTime": 300,
"cops_InitialNum": 60,
@ -514,9 +556,7 @@
"rotateAngle": 360,
"rotateDizzyTime": 1,
"moonshopmoney": [
10,
20,
30
502501250
],
"generaltp": {
"a": "item",
@ -545,7 +585,7 @@
"dispatch_checkmoney": {
"a": "attr",
"t": "gold",
"n": 1000
"n": 10000
},
"dispatch_Refreshtimes": 100,
"dispatch_numoftimes": 60,
@ -561,13 +601,8 @@
"g": [
{
"a": "item",
"t": "13001003",
"t": "10000001",
"n": 1
},
{
"a": "attr",
"t": "gold",
"n": 300
}
]
},
@ -576,13 +611,8 @@
"g": [
{
"a": "item",
"t": "13001003",
"n": 2
},
{
"a": "attr",
"t": "gold",
"n": 300
"t": "10000001",
"n": 1
}
]
},
@ -591,8 +621,8 @@
"g": [
{
"a": "item",
"t": "13001003",
"n": 4
"t": "10000001",
"n": 1
}
]
}
@ -643,7 +673,7 @@
"game_make_TunkNum": 5,
"pandamas_tiguandiaoxiang_cd": 10,
"Max_breakingbad_recipe": 15,
"puzzlePromptNum": 5,
"puzzlePromptNum": 9,
"Daily_Tips": {
"a": "item",
"t": "10000006",

View File

@ -209,7 +209,7 @@
"jump_interface": 10006,
"task_display": {
"key": "guild_guild_task_task_display_7",
"text": "完成1次功夫派遣任务"
"text": "完成1次功夫陪练任务"
},
"reward": [
{

View File

@ -12,7 +12,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "13001",
"rotation": "0|0|0",
"revolve": 0,
@ -84,7 +84,7 @@
"type": 1,
"ip": 6,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "13002",
"rotation": "0|0|0",
"revolve": 0,
@ -156,7 +156,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "13003",
"rotation": "0|0|0",
"revolve": 0,
@ -228,7 +228,7 @@
"type": 1,
"ip": 5,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "13004",
"rotation": "0|0|0",
"revolve": 0,
@ -804,7 +804,7 @@
"type": 1,
"ip": 9,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "14007",
"rotation": "0|0|0",
"revolve": 0,
@ -948,7 +948,7 @@
"type": 1,
"ip": 8,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "15002",
"rotation": "0|0|0",
"revolve": 0,
@ -1020,7 +1020,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "15003",
"rotation": "0|0|0",
"revolve": 0,
@ -1380,7 +1380,7 @@
"type": 1,
"ip": 12,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "23004",
"rotation": "0|0|0",
"revolve": 0,
@ -1452,7 +1452,7 @@
"type": 1,
"ip": 6,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "24001",
"rotation": "0|0|0",
"revolve": 0,
@ -1740,7 +1740,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "24005",
"rotation": "0|0|0",
"revolve": 0,
@ -2028,7 +2028,7 @@
"type": 1,
"ip": 9,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "24009",
"rotation": "0|0|0",
"revolve": 0,
@ -2460,7 +2460,7 @@
"type": 1,
"ip": 3,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "33002",
"rotation": "0|0|0",
"revolve": 0,
@ -2532,7 +2532,7 @@
"type": 1,
"ip": 5,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "33003",
"rotation": "0|0|0",
"revolve": 0,
@ -2964,7 +2964,7 @@
"type": 1,
"ip": 10,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "34003",
"rotation": "0|0|0",
"revolve": 0,
@ -3108,7 +3108,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "34005",
"rotation": "0|0|0",
"revolve": 0,
@ -3252,7 +3252,7 @@
"type": 1,
"ip": 5,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "34007",
"rotation": "0|0|0",
"revolve": 0,
@ -3324,7 +3324,7 @@
"type": 1,
"ip": 11,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "34008",
"rotation": "0|0|0",
"revolve": 0,
@ -3684,7 +3684,7 @@
"type": 1,
"ip": 12,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "35005",
"rotation": "0|0|0",
"revolve": 0,
@ -3756,7 +3756,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "35006",
"rotation": "0|0|0",
"revolve": 0,
@ -3972,7 +3972,7 @@
"type": 1,
"ip": 7,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "43003",
"rotation": "0|0|0",
"revolve": 0,
@ -4188,7 +4188,7 @@
"type": 1,
"ip": 9,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "43006",
"rotation": "0|0|0",
"revolve": 0,
@ -4548,7 +4548,7 @@
"type": 1,
"ip": 6,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "44004",
"rotation": "0|0|0",
"revolve": 0,
@ -4620,7 +4620,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "44006",
"rotation": "0|0|0",
"revolve": 0,
@ -4692,7 +4692,7 @@
"type": 1,
"ip": 4,
"sd": 1,
"handbook": -1,
"handbook": 1,
"prefab": "45001",
"rotation": "0|0|0",
"revolve": 0,

File diff suppressed because it is too large Load Diff

View File

@ -169,56 +169,6 @@
}
]
},
{
"index": "172",
"var": [
{
"a": "hero",
"t": "25001",
"n": 1
}
]
},
{
"index": "183",
"var": [
{
"a": "hero",
"t": "24002",
"n": 1
}
]
},
{
"index": "184",
"var": [
{
"a": "hero",
"t": "34006",
"n": 1
}
]
},
{
"index": "185",
"var": [
{
"a": "hero",
"t": "14003",
"n": 1
}
]
},
{
"index": "186",
"var": [
{
"a": "hero",
"t": "35001",
"n": 1
}
]
},
{
"index": "187",
"var": [

File diff suppressed because it is too large Load Diff

View File

@ -224,11 +224,11 @@
"id": 10006,
"title": {
"key": "itemlink_itemlink_title_18",
"text": "熊猫武馆-NPC派遣"
"text": "熊猫武馆-功夫陪练"
},
"desc": {
"key": "itemlink_itemlink_desc_18",
"text": "熊猫武馆派遣"
"text": "熊猫武馆功夫陪练"
},
"jumpid": 10006,
"icon": "ty_qp_gsb"
@ -271,5 +271,18 @@
},
"jumpid": 904,
"icon": "ty_qp_jy"
},
{
"id": 10014,
"title": {
"key": "itemlink_itemlink_title_12",
"text": "竞技场"
},
"desc": {
"key": "itemlink_itemlink_desc_12",
"text": "竞技场"
},
"jumpid": 10014,
"icon": "ty_qp_jjc"
}
]

View File

@ -6387,10 +6387,10 @@
"id": 267,
"lotteryid": 30010,
"description": "经验副本1",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6411,10 +6411,10 @@
"id": 268,
"lotteryid": 30010,
"description": "经验副本1",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6435,10 +6435,10 @@
"id": 269,
"lotteryid": 30010,
"description": "经验副本1",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6459,10 +6459,10 @@
"id": 270,
"lotteryid": 30020,
"description": "经验副本2",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6483,10 +6483,10 @@
"id": 271,
"lotteryid": 30020,
"description": "经验副本2",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6507,10 +6507,10 @@
"id": 272,
"lotteryid": 30020,
"description": "经验副本2",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6531,10 +6531,10 @@
"id": 273,
"lotteryid": 30030,
"description": "经验副本3",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6555,10 +6555,10 @@
"id": 274,
"lotteryid": 30030,
"description": "经验副本3",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6579,10 +6579,10 @@
"id": 275,
"lotteryid": 30030,
"description": "经验副本3",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6603,10 +6603,10 @@
"id": 276,
"lotteryid": 30040,
"description": "经验副本4",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6627,10 +6627,10 @@
"id": 277,
"lotteryid": 30040,
"description": "经验副本4",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6651,10 +6651,10 @@
"id": 278,
"lotteryid": 30040,
"description": "经验副本4",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6675,10 +6675,10 @@
"id": 279,
"lotteryid": 30050,
"description": "经验副本5",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6699,10 +6699,10 @@
"id": 280,
"lotteryid": 30050,
"description": "经验副本5",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6723,10 +6723,10 @@
"id": 281,
"lotteryid": 30050,
"description": "经验副本5",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6747,10 +6747,10 @@
"id": 282,
"lotteryid": 30060,
"description": "经验副本6",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6771,10 +6771,10 @@
"id": 283,
"lotteryid": 30060,
"description": "经验副本6",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6795,10 +6795,10 @@
"id": 284,
"lotteryid": 30060,
"description": "经验副本6",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6819,10 +6819,10 @@
"id": 285,
"lotteryid": 30070,
"description": "经验副本7",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6843,10 +6843,10 @@
"id": 286,
"lotteryid": 30070,
"description": "经验副本7",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6867,10 +6867,10 @@
"id": 287,
"lotteryid": 30070,
"description": "经验副本7",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6891,10 +6891,10 @@
"id": 288,
"lotteryid": 30080,
"description": "经验副本8",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6915,10 +6915,10 @@
"id": 289,
"lotteryid": 30080,
"description": "经验副本8",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6939,10 +6939,10 @@
"id": 290,
"lotteryid": 30080,
"description": "经验副本8",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -6963,10 +6963,10 @@
"id": 291,
"lotteryid": 30090,
"description": "经验副本9",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -6987,10 +6987,10 @@
"id": 292,
"lotteryid": 30090,
"description": "经验副本9",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7011,10 +7011,10 @@
"id": 293,
"lotteryid": 30090,
"description": "经验副本9",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7035,10 +7035,10 @@
"id": 294,
"lotteryid": 30090,
"description": "经验副本9",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -7059,10 +7059,10 @@
"id": 295,
"lotteryid": 30100,
"description": "经验副本10",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7083,10 +7083,10 @@
"id": 296,
"lotteryid": 30100,
"description": "经验副本10",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7107,10 +7107,10 @@
"id": 297,
"lotteryid": 30100,
"description": "经验副本10",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7131,10 +7131,10 @@
"id": 298,
"lotteryid": 30100,
"description": "经验副本10",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -7155,10 +7155,10 @@
"id": 299,
"lotteryid": 30110,
"description": "经验副本11",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7179,10 +7179,10 @@
"id": 300,
"lotteryid": 30110,
"description": "经验副本11",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7203,10 +7203,10 @@
"id": 301,
"lotteryid": 30110,
"description": "经验副本11",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7227,10 +7227,10 @@
"id": 302,
"lotteryid": 30110,
"description": "经验副本11",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "attr",
@ -7251,10 +7251,10 @@
"id": 303,
"lotteryid": 30120,
"description": "经验副本12",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7275,10 +7275,10 @@
"id": 304,
"lotteryid": 30120,
"description": "经验副本12",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7299,10 +7299,10 @@
"id": 305,
"lotteryid": 30120,
"description": "经验副本12",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "item",
@ -7323,10 +7323,10 @@
"id": 306,
"lotteryid": 30120,
"description": "经验副本12",
"type": 1,
"type": 2,
"groupwt": 1000,
"groupid": 1001,
"subtype": 1,
"subtype": 2,
"groupnum": 1,
"itemid": {
"a": "equip",

View File

@ -10,7 +10,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_1",
"text": "疯狂原始人"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_1",
@ -29,7 +29,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_2",
"text": "功夫熊猫"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_2",
@ -48,7 +48,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_3",
"text": "坏蛋联盟"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_3",
@ -67,7 +67,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_4",
"text": "乌龟大师"
"text": "智取邀请函"
},
"desc": {
"key": "mainchapter_main_chapter_desc_4",
@ -86,7 +86,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_5",
"text": "激烈战斗"
"text": "黑市风波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_5",
@ -105,7 +105,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_6",
"text": "下山"
"text": "小马王 · 一路向北"
},
"desc": {
"key": "mainchapter_main_chapter_desc_6",
@ -124,7 +124,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_7",
"text": "事件余波"
"text": "海洋之歌"
},
"desc": {
"key": "mainchapter_main_chapter_desc_7",
@ -143,7 +143,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_8",
"text": "乌龟大师"
"text": "布兰奇的逃亡"
},
"desc": {
"key": "mainchapter_main_chapter_desc_8",
@ -162,7 +162,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_9",
"text": "太狼来袭"
"text": "配方奶工厂"
},
"desc": {
"key": "mainchapter_main_chapter_desc_9",
@ -181,7 +181,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_10",
"text": "乌龟大师"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_10",
@ -200,7 +200,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_11",
"text": "太狼来袭"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_11",
@ -219,7 +219,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_12",
"text": "乌龟大师"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_12",
@ -238,7 +238,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_13",
"text": "功夫世界"
"text": "智取邀请函"
},
"desc": {
"key": "mainchapter_main_chapter_desc_13",
@ -257,7 +257,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_14",
"text": "练功房"
"text": "黑市风波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_14",
@ -276,7 +276,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_15",
"text": "太狼来袭"
"text": "小马王 · 一路向北"
},
"desc": {
"key": "mainchapter_main_chapter_desc_15",
@ -295,7 +295,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_16",
"text": "乌龟大师"
"text": "海洋之歌"
},
"desc": {
"key": "mainchapter_main_chapter_desc_16",
@ -314,7 +314,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_17",
"text": "激烈战斗"
"text": "布兰奇的逃亡"
},
"desc": {
"key": "mainchapter_main_chapter_desc_17",
@ -333,7 +333,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_18",
"text": "下山"
"text": "配方奶工厂"
},
"desc": {
"key": "mainchapter_main_chapter_desc_18",
@ -352,7 +352,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_19",
"text": "事件余波"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_19",
@ -371,7 +371,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_20",
"text": "乌龟大师"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_20",
@ -390,7 +390,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_21",
"text": "太狼来袭"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_21",
@ -409,7 +409,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_22",
"text": "乌龟大师"
"text": "智取邀请函"
},
"desc": {
"key": "mainchapter_main_chapter_desc_22",
@ -428,7 +428,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_23",
"text": "太狼来袭"
"text": "黑市风波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_23",
@ -447,7 +447,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_24",
"text": "乌龟大师"
"text": "小马王 · 一路向北"
},
"desc": {
"key": "mainchapter_main_chapter_desc_24",
@ -466,7 +466,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_13",
"text": "功夫世界"
"text": "海洋之歌"
},
"desc": {
"key": "mainchapter_main_chapter_desc_13",
@ -485,7 +485,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_14",
"text": "练功房"
"text": "布兰奇的逃亡"
},
"desc": {
"key": "mainchapter_main_chapter_desc_14",
@ -504,7 +504,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_15",
"text": "太狼来袭"
"text": "配方奶工厂"
},
"desc": {
"key": "mainchapter_main_chapter_desc_15",
@ -523,7 +523,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_16",
"text": "乌龟大师"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_16",
@ -542,7 +542,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_17",
"text": "激烈战斗"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_17",
@ -561,7 +561,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_18",
"text": "下山"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_18",
@ -580,7 +580,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_19",
"text": "事件余波"
"text": "智取邀请函"
},
"desc": {
"key": "mainchapter_main_chapter_desc_19",
@ -599,7 +599,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_20",
"text": "乌龟大师"
"text": "黑市风波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_20",
@ -618,7 +618,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_21",
"text": "太狼来袭"
"text": "小马王 · 一路向北"
},
"desc": {
"key": "mainchapter_main_chapter_desc_21",
@ -637,7 +637,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_22",
"text": "乌龟大师"
"text": "海洋之歌"
},
"desc": {
"key": "mainchapter_main_chapter_desc_22",
@ -656,7 +656,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_23",
"text": "太狼来袭"
"text": "布兰奇的逃亡"
},
"desc": {
"key": "mainchapter_main_chapter_desc_23",
@ -675,7 +675,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_24",
"text": "乌龟大师"
"text": "配方奶工厂"
},
"desc": {
"key": "mainchapter_main_chapter_desc_24",
@ -694,7 +694,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_13",
"text": "功夫世界"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_13",
@ -713,7 +713,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_14",
"text": "练功房"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_14",
@ -732,7 +732,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_15",
"text": "太狼来袭"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_15",
@ -751,7 +751,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_16",
"text": "乌龟大师"
"text": "智取邀请函"
},
"desc": {
"key": "mainchapter_main_chapter_desc_16",
@ -770,7 +770,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_17",
"text": "激烈战斗"
"text": "黑市风波"
},
"desc": {
"key": "mainchapter_main_chapter_desc_17",
@ -789,7 +789,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_18",
"text": "下山"
"text": "小马王 · 一路向北"
},
"desc": {
"key": "mainchapter_main_chapter_desc_18",
@ -808,7 +808,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_19",
"text": "事件余波"
"text": "海洋之歌"
},
"desc": {
"key": "mainchapter_main_chapter_desc_19",
@ -827,7 +827,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_20",
"text": "乌龟大师"
"text": "布兰奇的逃亡"
},
"desc": {
"key": "mainchapter_main_chapter_desc_20",
@ -846,7 +846,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_21",
"text": "太狼来袭"
"text": "配方奶工厂"
},
"desc": {
"key": "mainchapter_main_chapter_desc_21",
@ -865,7 +865,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_22",
"text": "乌龟大师"
"text": "预言之声"
},
"desc": {
"key": "mainchapter_main_chapter_desc_22",
@ -884,7 +884,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_23",
"text": "太狼来袭"
"text": "大龙复仇记"
},
"desc": {
"key": "mainchapter_main_chapter_desc_23",
@ -903,7 +903,7 @@
"camera": "",
"title": {
"key": "mainchapter_main_chapter_title_24",
"text": "乌龟大师"
"text": "小偷与大盗"
},
"desc": {
"key": "mainchapter_main_chapter_desc_24",

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
"sceneicon": "ty_qp_my01",
"functionname": {
"key": "navigation_Sheet1_functionname_1",
"text": "商"
"text": "商"
},
"npcName": [
"功能入口-商人"

View File

@ -99,8 +99,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100108
}
],
"wkqbx": 2,
@ -279,7 +279,7 @@
"id": "kungfu",
"name": {
"key": "opencond_opencond_name_13",
"text": "维京远征"
"text": "熊猫武馆"
},
"main": [
{
@ -348,7 +348,7 @@
"id": "vikingexpedition",
"name": {
"key": "opencond_opencond_name_16",
"text": "装备副本"
"text": "维京-装备副本"
},
"main": [
{
@ -371,7 +371,7 @@
"id": "vikingexpedition2",
"name": {
"key": "opencond_opencond_name_17",
"text": "武器副本"
"text": "维京-武器副本"
},
"main": [
{
@ -394,7 +394,7 @@
"id": "vikingexpedition3",
"name": {
"key": "opencond_opencond_name_18",
"text": "饰品副本"
"text": "维京-饰品副本"
},
"main": [
{
@ -559,8 +559,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100608
}
],
"wkqbx": 2,
@ -674,8 +674,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100308
}
],
"wkqbx": 0,
@ -743,8 +743,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100304
}
],
"wkqbx": 0,
@ -835,8 +835,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100304
}
],
"wkqbx": 0,
@ -858,8 +858,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100508
}
],
"wkqbx": 0,
@ -1228,6 +1228,10 @@
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100408
}
],
"wkqbx": 0,
@ -1364,8 +1368,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100107
}
],
"wkqbx": 1,
@ -1479,8 +1483,8 @@
},
"main": [
{
"key": 1,
"param": 1
"key": 2,
"param": 1100208
}
],
"wkqbx": 1,
@ -1598,7 +1602,12 @@
"key": "opencond_opencond_name_70",
"text": "经验副本"
},
"main": [],
"main": [
{
"key": 2,
"param": 1100204
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
@ -1659,20 +1668,24 @@
{
"id": "trials3",
"name": {
"key": "opencond_opencond_name_54",
"key": "opencond_opencond_name_73",
"text": "主线关卡-精英"
},
"main": [
{
"key": 1,
"param": 1
},
{
"key": 2,
"param": 1100808
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "zc_icon_01",
"prompt": {
"key": "opencond_opencond_prompt_54",
"key": "opencond_opencond_prompt_73",
"text": "功能暂未开启"
},
"uiid": 0,
@ -1682,20 +1695,139 @@
{
"id": "trials4",
"name": {
"key": "opencond_opencond_name_54",
"key": "opencond_opencond_name_74",
"text": "主线关卡-炼狱"
},
"main": [
{
"key": 1,
"param": 9999
"param": 1
},
{
"key": 2,
"param": 1301208
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "zc_icon_01",
"prompt": {
"key": "opencond_opencond_prompt_54",
"key": "opencond_opencond_prompt_74",
"text": "功能暂未开启"
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "week_task",
"name": {
"key": "opencond_opencond_name_75",
"text": "波比周常"
},
"main": [
{
"key": 2,
"param": 1100208
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_75",
"text": "功能暂未开启"
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "daily_practice",
"name": {
"key": "opencond_opencond_name_76",
"text": "每日一练"
},
"main": [
{
"key": 2,
"param": 1100504
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_76",
"text": "功能暂未开启"
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "bounty_quest",
"name": {
"key": "opencond_opencond_name_77",
"text": "悬赏任务"
},
"main": [
{
"key": 2,
"param": 1100504
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_77",
"text": "功能暂未开启"
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "puzzle",
"name": {
"key": "opencond_opencond_name_78",
"text": "拼图"
},
"main": [
{
"key": 2,
"param": 1100604
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_78",
"text": "功能暂未开启"
},
"uiid": 0,
"activateType": 0,
"notify": []
},
{
"id": "cooking",
"name": {
"key": "opencond_opencond_name_79",
"text": "烹饪功能"
},
"main": [
{
"key": 2,
"param": 1100608
}
],
"wkqbx": 0,
"kqbx": 0,
"img": "",
"prompt": {
"key": "opencond_opencond_prompt_79",
"text": "功能暂未开启"
},
"uiid": 0,

View File

@ -8,7 +8,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -44,7 +44,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -75,7 +75,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -106,7 +106,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -137,7 +137,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -179,7 +179,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -210,7 +210,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -241,7 +241,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -272,7 +272,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -303,7 +303,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda1",
"text": "狂暴五侠"
"text": "高能武者"
},
"BattleReadyID": 118,
"monster_id": [
@ -346,7 +346,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -377,7 +377,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -408,7 +408,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -439,7 +439,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -470,7 +470,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -512,7 +512,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -543,7 +543,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -574,7 +574,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -605,7 +605,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -636,7 +636,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda2",
"text": "一代宗师"
"text": "训练高手"
},
"BattleReadyID": 118,
"monster_id": [
@ -679,7 +679,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -710,7 +710,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -741,7 +741,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -772,7 +772,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -803,7 +803,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -845,7 +845,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -876,7 +876,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -907,7 +907,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -938,7 +938,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -969,7 +969,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda3",
"text": "武学奇才"
"text": "取物专家"
},
"BattleReadyID": 118,
"monster_id": [
@ -1012,7 +1012,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1043,7 +1043,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1074,7 +1074,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1105,7 +1105,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1136,7 +1136,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1178,7 +1178,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1209,7 +1209,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1240,7 +1240,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1271,7 +1271,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1302,7 +1302,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda4",
"text": "武学奇才"
"text": "江湖义士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1345,7 +1345,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1376,7 +1376,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1407,7 +1407,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1438,7 +1438,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1469,7 +1469,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1511,7 +1511,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1542,7 +1542,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1573,7 +1573,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1604,7 +1604,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1635,7 +1635,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda5",
"text": "武学奇才"
"text": "调解大师"
},
"BattleReadyID": 118,
"monster_id": [
@ -1678,7 +1678,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1709,7 +1709,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1740,7 +1740,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1771,7 +1771,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1802,7 +1802,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1844,7 +1844,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1875,7 +1875,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1906,7 +1906,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1937,7 +1937,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -1968,7 +1968,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda6",
"text": "武学奇才"
"text": "勇猛战士"
},
"BattleReadyID": 118,
"monster_id": [
@ -2011,7 +2011,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2042,7 +2042,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2073,7 +2073,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2104,7 +2104,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2135,7 +2135,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2177,7 +2177,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2208,7 +2208,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2239,7 +2239,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2270,7 +2270,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2301,7 +2301,7 @@
"tabIcon": "xmwg_fb_rk3",
"tabTitle": {
"key": "pagoda7",
"text": "武学奇才"
"text": "新潮人类"
},
"BattleReadyID": 118,
"monster_id": [
@ -2344,7 +2344,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2375,7 +2375,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2406,7 +2406,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2437,7 +2437,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2468,7 +2468,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2510,7 +2510,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2541,7 +2541,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2572,7 +2572,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2603,7 +2603,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2634,7 +2634,7 @@
"tabIcon": "xmwg_fb_rk4",
"tabTitle": {
"key": "pagoda8",
"text": "武学奇才"
"text": "驯龙天才"
},
"BattleReadyID": 118,
"monster_id": [
@ -2677,7 +2677,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2708,7 +2708,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2739,7 +2739,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2770,7 +2770,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2801,7 +2801,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2843,7 +2843,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2874,7 +2874,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2905,7 +2905,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2936,7 +2936,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -2967,7 +2967,7 @@
"tabIcon": "xmwg_fb_rk1",
"tabTitle": {
"key": "pagoda9",
"text": "武学奇才"
"text": "流浪侠客"
},
"BattleReadyID": 118,
"monster_id": [
@ -3010,7 +3010,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3041,7 +3041,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3072,7 +3072,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3103,7 +3103,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3134,7 +3134,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3176,7 +3176,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3207,7 +3207,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3238,7 +3238,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3269,7 +3269,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [
@ -3300,7 +3300,7 @@
"tabIcon": "xmwg_fb_rk2",
"tabTitle": {
"key": "pagoda10",
"text": "武学奇才"
"text": "一代宗师"
},
"BattleReadyID": 118,
"monster_id": [

View File

@ -4,7 +4,7 @@
"refreshtime": 1,
"pagename": {
"key": "paypackage_paypackage_pagename_1",
"text": "每日礼包"
"text": "每日礼包1"
},
"packagetype": "0",
"buy_num": 1,
@ -16,29 +16,24 @@
{
"a": "attr",
"t": "diamond",
"n": 0
"n": 10
}
],
"item": [
{
"a": "item",
"t": "10000008",
"n": 5
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "item",
"t": "10000009",
"n": 5
"a": "attr",
"t": "ps",
"n": 50
},
{
"a": "item",
"t": "10000010",
"n": 5
},
{
"a": "item",
"t": "10000011",
"n": 5
"a": "attr",
"t": "gold",
"n": 50000
}
]
},
@ -47,7 +42,7 @@
"refreshtime": 1,
"pagename": {
"key": "paypackage_paypackage_pagename_2",
"text": "每日礼包"
"text": "每日礼包2"
},
"packagetype": "day_1",
"buy_num": 2,
@ -58,19 +53,19 @@
"costitem": [],
"item": [
{
"a": "item",
"t": "10000008",
"n": 5
"a": "attr",
"t": "diamond",
"n": 60
},
{
"a": "item",
"t": "10000009",
"n": 5
"t": "10000003",
"n": 3
},
{
"a": "item",
"t": "10000010",
"n": 5
"a": "attr",
"t": "gold",
"n": 120000
}
]
},
@ -79,64 +74,94 @@
"refreshtime": 1,
"pagename": {
"key": "paypackage_paypackage_pagename_3",
"text": "每日礼包"
"text": "每日礼包3"
},
"packagetype": "day_2",
"buy_num": 2,
"buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_3",
"text": "每日礼包3"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 300
},
{
"a": "item",
"t": "17010001",
"n": 1
"t": "10000001",
"n": 6
},
{
"a": "attr",
"t": "gold",
"n": 300000
}
]
},
{
"id": 4,
"refreshtime": 7,
"refreshtime": 1,
"pagename": {
"key": "paypackage_paypackage_pagename_4",
"text": "每周礼包"
"text": "每日礼包4"
},
"packagetype": "week_1",
"packagetype": "day_3",
"buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_4",
"text": "每周礼包1"
"text": "每日礼包4"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 680
},
{
"a": "item",
"t": "17020001",
"n": 1
"t": "10000009",
"n": 5
},
{
"a": "attr",
"t": "gold",
"n": 300000
}
]
},
{
"id": 5,
"refreshtime": 7,
"refreshtime": 1,
"pagename": {
"key": "paypackage_paypackage_pagename_5",
"text": "每周礼包"
"text": "每日礼包5"
},
"packagetype": "week_2",
"packagetype": "day_4",
"buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_5",
"text": "每周礼包2"
"text": "每日礼包5"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 1280
},
{
"a": "item",
"t": "17020001",
"n": 1
"t": "10000013",
"n": 5
},
{
"a": "attr",
"t": "gold",
"n": 300000
}
]
},
@ -145,20 +170,25 @@
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_6",
"text": "每周礼包"
"text": "每周礼包1"
},
"packagetype": "week_3",
"buy_num": 3,
"packagetype": "week_1",
"buy_num": 1,
"packagename": {
"key": "paypackage_paypackage_packagename_6",
"text": "每周礼包3"
"text": "每周礼包1"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 300
},
{
"a": "item",
"t": "17020001",
"n": 1
"t": "10000001",
"n": 8
}
]
},
@ -167,20 +197,30 @@
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_7",
"text": "每周礼包"
"text": "每周礼包2"
},
"packagetype": "week_4",
"buy_num": 3,
"packagetype": "week_2",
"buy_num": 2,
"packagename": {
"key": "paypackage_paypackage_packagename_7",
"text": "每周礼包4"
"text": "每周礼包2"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "17020001",
"t": "10000010",
"n": 1
},
{
"a": "item",
"t": "10000009",
"n": 2
}
]
},
@ -189,86 +229,251 @@
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_8",
"text": "每周礼包"
"text": "每周礼包3"
},
"packagetype": "week_5",
"packagetype": "week_3",
"buy_num": 3,
"packagename": {
"key": "paypackage_paypackage_packagename_8",
"text": "每周礼包5"
"text": "每周礼包3"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "17020001",
"n": 1
"t": "10000010",
"n": 3
}
]
},
{
"id": 9,
"refreshtime": 30,
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_9",
"text": "每月礼包"
"text": "每周礼包4"
},
"packagetype": "month_1",
"buy_num": 1,
"packagetype": "week_4",
"buy_num": 4,
"packagename": {
"key": "paypackage_paypackage_packagename_9",
"text": "每月礼包1"
"text": "每周礼包4"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 3280
},
{
"a": "item",
"t": "17030001",
"n": 1
"t": "10000001",
"n": 40
},
{
"a": "attr",
"t": "gold",
"n": 5000000
}
]
},
{
"id": 10,
"refreshtime": 30,
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_10",
"text": "每月礼包"
"text": "每周礼包5"
},
"packagetype": "month_2",
"buy_num": 1,
"packagetype": "week_5",
"buy_num": 5,
"packagename": {
"key": "paypackage_paypackage_packagename_10",
"text": "每月礼包2"
"text": "每周礼包5"
},
"costitem": [],
"item": [
{
"a": "item",
"t": "17030001",
"n": 1
"a": "attr",
"t": "diamond",
"n": 4480
},
{
"a": "attr",
"t": "gold",
"n": 7500000
}
]
},
{
"id": 11,
"refreshtime": 30,
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_11",
"text": "每月礼包"
"text": "每周礼包6"
},
"packagetype": "month_3",
"buy_num": 1,
"packagetype": "week_6",
"buy_num": 999,
"packagename": {
"key": "paypackage_paypackage_packagename_11",
"text": "每周礼包6"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 6480
},
{
"a": "attr",
"t": "gold",
"n": 10000000
}
]
},
{
"id": 12,
"refreshtime": 7,
"pagename": {
"key": "paypackage_paypackage_pagename_12",
"text": "每周礼包7"
},
"packagetype": "week_6",
"buy_num": 999,
"packagename": {
"key": "paypackage_paypackage_packagename_12",
"text": "每周礼包7"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 6480
},
{
"a": "item",
"t": "10000001",
"n": 60
},
{
"a": "attr",
"t": "gold",
"n": 10000000
}
]
},
{
"id": 13,
"refreshtime": 30,
"pagename": {
"key": "paypackage_paypackage_pagename_13",
"text": "每月礼包1"
},
"packagetype": "month_2",
"buy_num": 5,
"packagename": {
"key": "paypackage_paypackage_packagename_13",
"text": "每月礼包1"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "10000006",
"n": 100
}
]
},
{
"id": 14,
"refreshtime": 30,
"pagename": {
"key": "paypackage_paypackage_pagename_14",
"text": "每月礼包2"
},
"packagetype": "month_2",
"buy_num": 5,
"packagename": {
"key": "paypackage_paypackage_packagename_14",
"text": "每月礼包2"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "17060008",
"n": 85
}
]
},
{
"id": 15,
"refreshtime": 30,
"pagename": {
"key": "paypackage_paypackage_pagename_15",
"text": "每月礼包3"
},
"packagetype": "month_2",
"buy_num": 5,
"packagename": {
"key": "paypackage_paypackage_packagename_15",
"text": "每月礼包3"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "17030001",
"n": 1
"t": "13000001",
"n": 300
}
]
},
{
"id": 16,
"refreshtime": 30,
"pagename": {
"key": "paypackage_paypackage_pagename_16",
"text": "每月礼包4"
},
"packagetype": "month_2",
"buy_num": 5,
"packagename": {
"key": "paypackage_paypackage_packagename_16",
"text": "每月礼包4"
},
"costitem": [],
"item": [
{
"a": "attr",
"t": "diamond",
"n": 980
},
{
"a": "item",
"t": "13000002",
"n": 20
}
]
}

View File

@ -3,7 +3,7 @@
"lv": 1,
"exp": 0,
"reward": [],
"ps_ceiling": 120,
"ps_ceiling": 180,
"cops_ps_ceiling": 60
},
{
@ -16,7 +16,7 @@
"n": 30
}
],
"ps_ceiling": 121,
"ps_ceiling": 180,
"cops_ps_ceiling": 62
},
{
@ -29,7 +29,7 @@
"n": 30
}
],
"ps_ceiling": 122,
"ps_ceiling": 180,
"cops_ps_ceiling": 64
},
{
@ -42,7 +42,7 @@
"n": 30
}
],
"ps_ceiling": 123,
"ps_ceiling": 180,
"cops_ps_ceiling": 66
},
{
@ -55,7 +55,7 @@
"n": 30
}
],
"ps_ceiling": 124,
"ps_ceiling": 180,
"cops_ps_ceiling": 68
},
{
@ -68,7 +68,7 @@
"n": 30
}
],
"ps_ceiling": 125,
"ps_ceiling": 180,
"cops_ps_ceiling": 70
},
{
@ -81,7 +81,7 @@
"n": 30
}
],
"ps_ceiling": 126,
"ps_ceiling": 180,
"cops_ps_ceiling": 72
},
{
@ -94,7 +94,7 @@
"n": 30
}
],
"ps_ceiling": 127,
"ps_ceiling": 180,
"cops_ps_ceiling": 74
},
{
@ -107,7 +107,7 @@
"n": 30
}
],
"ps_ceiling": 128,
"ps_ceiling": 180,
"cops_ps_ceiling": 76
},
{
@ -120,7 +120,7 @@
"n": 30
}
],
"ps_ceiling": 129,
"ps_ceiling": 180,
"cops_ps_ceiling": 78
},
{
@ -133,7 +133,7 @@
"n": 30
}
],
"ps_ceiling": 130,
"ps_ceiling": 180,
"cops_ps_ceiling": 80
},
{
@ -146,7 +146,7 @@
"n": 30
}
],
"ps_ceiling": 131,
"ps_ceiling": 180,
"cops_ps_ceiling": 82
},
{
@ -159,7 +159,7 @@
"n": 30
}
],
"ps_ceiling": 132,
"ps_ceiling": 180,
"cops_ps_ceiling": 84
},
{
@ -172,7 +172,7 @@
"n": 30
}
],
"ps_ceiling": 133,
"ps_ceiling": 180,
"cops_ps_ceiling": 86
},
{
@ -185,7 +185,7 @@
"n": 30
}
],
"ps_ceiling": 134,
"ps_ceiling": 180,
"cops_ps_ceiling": 88
},
{
@ -198,7 +198,7 @@
"n": 30
}
],
"ps_ceiling": 135,
"ps_ceiling": 180,
"cops_ps_ceiling": 90
},
{
@ -211,7 +211,7 @@
"n": 30
}
],
"ps_ceiling": 136,
"ps_ceiling": 180,
"cops_ps_ceiling": 92
},
{
@ -224,7 +224,7 @@
"n": 30
}
],
"ps_ceiling": 137,
"ps_ceiling": 180,
"cops_ps_ceiling": 94
},
{
@ -237,7 +237,7 @@
"n": 30
}
],
"ps_ceiling": 138,
"ps_ceiling": 180,
"cops_ps_ceiling": 96
},
{
@ -250,7 +250,7 @@
"n": 30
}
],
"ps_ceiling": 139,
"ps_ceiling": 180,
"cops_ps_ceiling": 98
},
{
@ -263,7 +263,7 @@
"n": 30
}
],
"ps_ceiling": 140,
"ps_ceiling": 180,
"cops_ps_ceiling": 100
},
{
@ -276,7 +276,7 @@
"n": 30
}
],
"ps_ceiling": 141,
"ps_ceiling": 180,
"cops_ps_ceiling": 102
},
{
@ -289,7 +289,7 @@
"n": 30
}
],
"ps_ceiling": 142,
"ps_ceiling": 180,
"cops_ps_ceiling": 104
},
{
@ -302,7 +302,7 @@
"n": 30
}
],
"ps_ceiling": 143,
"ps_ceiling": 180,
"cops_ps_ceiling": 106
},
{
@ -315,7 +315,7 @@
"n": 30
}
],
"ps_ceiling": 144,
"ps_ceiling": 180,
"cops_ps_ceiling": 108
},
{
@ -328,7 +328,7 @@
"n": 30
}
],
"ps_ceiling": 145,
"ps_ceiling": 180,
"cops_ps_ceiling": 110
},
{
@ -341,7 +341,7 @@
"n": 30
}
],
"ps_ceiling": 146,
"ps_ceiling": 180,
"cops_ps_ceiling": 112
},
{
@ -354,7 +354,7 @@
"n": 30
}
],
"ps_ceiling": 147,
"ps_ceiling": 180,
"cops_ps_ceiling": 114
},
{
@ -367,7 +367,7 @@
"n": 30
}
],
"ps_ceiling": 148,
"ps_ceiling": 180,
"cops_ps_ceiling": 116
},
{
@ -380,7 +380,7 @@
"n": 30
}
],
"ps_ceiling": 149,
"ps_ceiling": 180,
"cops_ps_ceiling": 118
},
{
@ -393,7 +393,7 @@
"n": 30
}
],
"ps_ceiling": 150,
"ps_ceiling": 180,
"cops_ps_ceiling": 120
},
{
@ -406,7 +406,7 @@
"n": 30
}
],
"ps_ceiling": 151,
"ps_ceiling": 180,
"cops_ps_ceiling": 122
},
{
@ -419,7 +419,7 @@
"n": 30
}
],
"ps_ceiling": 152,
"ps_ceiling": 180,
"cops_ps_ceiling": 124
},
{
@ -432,7 +432,7 @@
"n": 30
}
],
"ps_ceiling": 153,
"ps_ceiling": 180,
"cops_ps_ceiling": 126
},
{
@ -445,7 +445,7 @@
"n": 30
}
],
"ps_ceiling": 154,
"ps_ceiling": 180,
"cops_ps_ceiling": 128
},
{
@ -458,7 +458,7 @@
"n": 30
}
],
"ps_ceiling": 155,
"ps_ceiling": 180,
"cops_ps_ceiling": 130
},
{
@ -471,7 +471,7 @@
"n": 30
}
],
"ps_ceiling": 156,
"ps_ceiling": 180,
"cops_ps_ceiling": 132
},
{
@ -484,7 +484,7 @@
"n": 30
}
],
"ps_ceiling": 157,
"ps_ceiling": 180,
"cops_ps_ceiling": 134
},
{
@ -497,7 +497,7 @@
"n": 30
}
],
"ps_ceiling": 158,
"ps_ceiling": 180,
"cops_ps_ceiling": 136
},
{
@ -510,7 +510,7 @@
"n": 30
}
],
"ps_ceiling": 159,
"ps_ceiling": 180,
"cops_ps_ceiling": 138
},
{
@ -523,7 +523,7 @@
"n": 30
}
],
"ps_ceiling": 160,
"ps_ceiling": 180,
"cops_ps_ceiling": 140
},
{
@ -536,7 +536,7 @@
"n": 30
}
],
"ps_ceiling": 162,
"ps_ceiling": 180,
"cops_ps_ceiling": 142
},
{
@ -549,7 +549,7 @@
"n": 30
}
],
"ps_ceiling": 164,
"ps_ceiling": 180,
"cops_ps_ceiling": 144
},
{
@ -562,7 +562,7 @@
"n": 30
}
],
"ps_ceiling": 166,
"ps_ceiling": 180,
"cops_ps_ceiling": 146
},
{
@ -575,7 +575,7 @@
"n": 30
}
],
"ps_ceiling": 168,
"ps_ceiling": 180,
"cops_ps_ceiling": 148
},
{
@ -588,7 +588,7 @@
"n": 30
}
],
"ps_ceiling": 170,
"ps_ceiling": 180,
"cops_ps_ceiling": 150
},
{
@ -601,7 +601,7 @@
"n": 30
}
],
"ps_ceiling": 172,
"ps_ceiling": 180,
"cops_ps_ceiling": 152
},
{
@ -614,7 +614,7 @@
"n": 30
}
],
"ps_ceiling": 174,
"ps_ceiling": 180,
"cops_ps_ceiling": 154
},
{
@ -627,7 +627,7 @@
"n": 30
}
],
"ps_ceiling": 176,
"ps_ceiling": 180,
"cops_ps_ceiling": 156
},
{
@ -653,7 +653,7 @@
"n": 30
}
],
"ps_ceiling": 182,
"ps_ceiling": 180,
"cops_ps_ceiling": 160
},
{
@ -666,7 +666,7 @@
"n": 30
}
],
"ps_ceiling": 184,
"ps_ceiling": 180,
"cops_ps_ceiling": 162
},
{
@ -679,7 +679,7 @@
"n": 30
}
],
"ps_ceiling": 186,
"ps_ceiling": 180,
"cops_ps_ceiling": 164
},
{
@ -692,7 +692,7 @@
"n": 30
}
],
"ps_ceiling": 188,
"ps_ceiling": 180,
"cops_ps_ceiling": 166
},
{
@ -705,7 +705,7 @@
"n": 30
}
],
"ps_ceiling": 190,
"ps_ceiling": 180,
"cops_ps_ceiling": 168
},
{
@ -718,7 +718,7 @@
"n": 30
}
],
"ps_ceiling": 192,
"ps_ceiling": 180,
"cops_ps_ceiling": 170
},
{
@ -731,7 +731,7 @@
"n": 30
}
],
"ps_ceiling": 194,
"ps_ceiling": 180,
"cops_ps_ceiling": 172
},
{
@ -744,7 +744,7 @@
"n": 30
}
],
"ps_ceiling": 196,
"ps_ceiling": 180,
"cops_ps_ceiling": 174
},
{
@ -757,7 +757,7 @@
"n": 30
}
],
"ps_ceiling": 198,
"ps_ceiling": 180,
"cops_ps_ceiling": 176
},
{
@ -770,7 +770,7 @@
"n": 30
}
],
"ps_ceiling": 200,
"ps_ceiling": 180,
"cops_ps_ceiling": 178
}
]

View File

@ -6,10 +6,15 @@
"assert_day": 30,
"renew_day": 3,
"day_reward": [
{
"a": "attr",
"t": "gold",
"n": 100000
},
{
"a": "attr",
"t": "diamond",
"n": 60
"n": 90
}
],
"disposable_reward": [
@ -20,9 +25,7 @@
}
],
"privilege_id": [
10101,
10102,
10103
20201
]
},
{
@ -32,10 +35,15 @@
"assert_day": 30,
"renew_day": 3,
"day_reward": [
{
"a": "attr",
"t": "ps",
"n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 90
"n": 300
}
],
"disposable_reward": [
@ -46,9 +54,7 @@
}
],
"privilege_id": [
10201,
10202,
10203
20201
]
},
{

File diff suppressed because it is too large Load Diff

View File

@ -9,29 +9,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 6000
"n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 6000
"n": 60
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
"n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 12000
"n": 30
}
],
"channel": "0",
"text": "0",
"show": "$6",
"show": "6",
"image": "cz_zs_01"
},
{
@ -44,29 +44,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 30000
"n": 300
},
{
"a": "attr",
"t": "diamond",
"n": 30000
"n": 300
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
"n": 300
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 150
}
],
"channel": "0",
"text": "0",
"show": "$30",
"show": "30",
"image": "cz_zs_02"
},
{
@ -79,29 +79,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 68000
"n": 680
},
{
"a": "attr",
"t": "diamond",
"n": 68000
"n": 680
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 68000
"n": 680
},
{
"a": "attr",
"t": "diamond",
"n": 136000
"n": 340
}
],
"channel": "0",
"text": "0",
"show": "$68",
"show": "68",
"image": "cz_zs_02"
},
{
@ -114,29 +114,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 98000
"n": 980
},
{
"a": "attr",
"t": "diamond",
"n": 98000
"n": 980
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 98000
"n": 980
},
{
"a": "attr",
"t": "diamond",
"n": 196000
"n": 490
}
],
"channel": "0",
"text": "0",
"show": "$98",
"show": "98",
"image": "cz_zs_02"
},
{
@ -149,29 +149,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 128000
"n": 1280
},
{
"a": "attr",
"t": "diamond",
"n": 128000
"n": 1280
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 128000
"n": 1280
},
{
"a": "attr",
"t": "diamond",
"n": 256000
"n": 640
}
],
"channel": "0",
"text": "0",
"show": "$128",
"show": "128",
"image": "cz_zs_03"
},
{
@ -184,29 +184,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 198000
"n": 1980
},
{
"a": "attr",
"t": "diamond",
"n": 198000
"n": 1980
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 198000
"n": 1980
},
{
"a": "attr",
"t": "diamond",
"n": 396000
"n": 990
}
],
"channel": "0",
"text": "0",
"show": "$198",
"show": "198",
"image": "cz_zs_03"
},
{
@ -219,29 +219,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 328000
"n": 3280
},
{
"a": "attr",
"t": "diamond",
"n": 328000
"n": 3280
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 328000
"n": 3280
},
{
"a": "attr",
"t": "diamond",
"n": 656000
"n": 1640
}
],
"channel": "0",
"text": "0",
"show": "$328",
"show": "328",
"image": "cz_zs_03"
},
{
@ -254,29 +254,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 648000
"n": 6480
},
{
"a": "attr",
"t": "diamond",
"n": 648000
"n": 6480
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 648000
"n": 6480
},
{
"a": "attr",
"t": "diamond",
"n": 1296000
"n": 3240
}
],
"channel": "0",
"text": "0",
"show": "$648",
"show": "648",
"image": "cz_zs_03"
},
{
@ -289,29 +289,29 @@
{
"a": "attr",
"t": "vipexp",
"n": 6000
"n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 6000
"n": 60
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
"n": 60
},
{
"a": "attr",
"t": "diamond",
"n": 12000
"n": 30
}
],
"channel": "0",
"text": "0",
"show": "$6",
"show": "6",
"image": ""
},
{
@ -324,29 +324,13 @@
{
"a": "attr",
"t": "vipexp",
"n": 6000
},
{
"a": "attr",
"t": "diamond",
"n": 6000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
},
{
"a": "attr",
"t": "diamond",
"n": 12000
"n": 60
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$6",
"show": "6元",
"image": ""
},
{
@ -354,34 +338,56 @@
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 600,
"amount": 3000,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
},
{
"a": "attr",
"t": "diamond",
"n": 6000
"n": 300
}
],
"diamond_num_double": [
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "30元",
"image": ""
},
{
"id": "day_3",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 6800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 6000
},
{
"a": "attr",
"t": "diamond",
"n": 12000
"n": 680
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$6",
"show": "68元",
"image": ""
},
{
"id": "day_4",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 12800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 1280
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "128元",
"image": ""
},
{
@ -394,29 +400,13 @@
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 300
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "30元",
"image": ""
},
{
@ -424,34 +414,18 @@
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 3000,
"amount": 9800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 980
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "98元",
"image": ""
},
{
@ -459,34 +433,18 @@
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 3000,
"amount": 19800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 1980
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "198元",
"image": ""
},
{
@ -494,34 +452,18 @@
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 3000,
"amount": 32800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 30000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 3280
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "328元",
"image": ""
},
{
@ -529,34 +471,37 @@
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 3000,
"amount": 44800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 30000
"n": 4480
}
],
"diamond_num_double": [
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "448元",
"image": ""
},
{
"id": "week_6",
"editionid": "debug",
"recharge_type": 2,
"monetaryunit": "¥",
"amount": 64800,
"vipexp": [
{
"a": "attr",
"t": "vipexp",
"n": 30000
},
{
"a": "attr",
"t": "diamond",
"n": 60000
"n": 6480
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "648元",
"image": ""
},
{
@ -569,29 +514,13 @@
{
"a": "attr",
"t": "vipexp",
"n": 128000
},
{
"a": "attr",
"t": "diamond",
"n": 128000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 128000
},
{
"a": "attr",
"t": "diamond",
"n": 256000
"n": 1280
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$128",
"show": "128元",
"image": ""
},
{
@ -604,29 +533,13 @@
{
"a": "attr",
"t": "vipexp",
"n": 198000
},
{
"a": "attr",
"t": "diamond",
"n": 198000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 198000
},
{
"a": "attr",
"t": "diamond",
"n": 396000
"n": 1980
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$198",
"show": "198元",
"image": ""
},
{
@ -639,29 +552,13 @@
{
"a": "attr",
"t": "vipexp",
"n": 328000
},
{
"a": "attr",
"t": "diamond",
"n": 328000
}
],
"diamond_num_double": [
{
"a": "attr",
"t": "vipexp",
"n": 328000
},
{
"a": "attr",
"t": "diamond",
"n": 656000
"n": 3280
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$328",
"show": "328元",
"image": ""
},
{
@ -674,18 +571,18 @@
{
"a": "attr",
"t": "vipexp",
"n": 30000
"n": 300
},
{
"a": "attr",
"t": "diamond",
"n": 30000
"n": 300
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$30",
"show": "30",
"image": ""
},
{
@ -698,18 +595,18 @@
{
"a": "attr",
"t": "vipexp",
"n": 98000
"n": 980
},
{
"a": "attr",
"t": "diamond",
"n": 98000
"n": 980
}
],
"diamond_num_double": [],
"channel": "0",
"text": "0",
"show": "$98",
"show": "98",
"image": ""
}
]

View File

@ -377,6 +377,15 @@
"path": "Root|Smithy|IllustratedBubble|Reward",
"header": ""
},
{
"id": 17108,
"msg_type": 2,
"show_type": 0,
"count_type": 0,
"group": "",
"path": "Root|Smithy",
"header": ""
},
{
"id": 18100,
"msg_type": 0,

View File

@ -3,7 +3,10 @@
"robotid": 10001,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_1",
"text": "玩家1"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -64,7 +67,10 @@
"robotid": 10002,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream002",
"name": {
"key": "robot_Sheet1_text_2",
"text": "玩家2"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -125,7 +131,10 @@
"robotid": 10003,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream003",
"name": {
"key": "robot_Sheet1_text_3",
"text": "玩家3"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -186,7 +195,10 @@
"robotid": 10004,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream004",
"name": {
"key": "robot_Sheet1_text_4",
"text": "玩家4"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -247,7 +259,10 @@
"robotid": 10005,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream005",
"name": {
"key": "robot_Sheet1_text_5",
"text": "玩家5"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -308,7 +323,10 @@
"robotid": 10006,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream006",
"name": {
"key": "robot_Sheet1_text_6",
"text": "玩家6"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -369,7 +387,10 @@
"robotid": 10007,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream007",
"name": {
"key": "robot_Sheet1_text_7",
"text": "玩家7"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -430,7 +451,10 @@
"robotid": 10008,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream008",
"name": {
"key": "robot_Sheet1_text_8",
"text": "玩家8"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -491,7 +515,10 @@
"robotid": 10009,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream009",
"name": {
"key": "robot_Sheet1_text_9",
"text": "玩家9"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -552,7 +579,10 @@
"robotid": 10010,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream010",
"name": {
"key": "robot_Sheet1_text_10",
"text": "玩家10"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -613,7 +643,10 @@
"robotid": 10011,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_11",
"text": "玩家11"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -674,7 +707,10 @@
"robotid": 10012,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_12",
"text": "玩家12"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -735,7 +771,10 @@
"robotid": 10013,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_13",
"text": "玩家13"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -796,7 +835,10 @@
"robotid": 10014,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_14",
"text": "玩家14"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -857,7 +899,10 @@
"robotid": 10015,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_15",
"text": "玩家15"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -918,7 +963,10 @@
"robotid": 10016,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_16",
"text": "玩家16"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -979,7 +1027,10 @@
"robotid": 10017,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_17",
"text": "玩家17"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1040,7 +1091,10 @@
"robotid": 10018,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_18",
"text": "玩家18"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1101,7 +1155,10 @@
"robotid": 10019,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_19",
"text": "玩家19"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1162,7 +1219,10 @@
"robotid": 10020,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_20",
"text": "玩家20"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1223,7 +1283,10 @@
"robotid": 10021,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_21",
"text": "玩家21"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1284,7 +1347,10 @@
"robotid": 10022,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_22",
"text": "玩家22"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1345,7 +1411,10 @@
"robotid": 10023,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_23",
"text": "玩家23"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1406,7 +1475,10 @@
"robotid": 10024,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_24",
"text": "玩家24"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1467,7 +1539,10 @@
"robotid": 10025,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_25",
"text": "玩家25"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1528,7 +1603,10 @@
"robotid": 10026,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_26",
"text": "玩家26"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1589,7 +1667,10 @@
"robotid": 10027,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_27",
"text": "玩家27"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1650,7 +1731,10 @@
"robotid": 10028,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_28",
"text": "玩家28"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1711,7 +1795,10 @@
"robotid": 10029,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_29",
"text": "玩家29"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1772,7 +1859,10 @@
"robotid": 10030,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_30",
"text": "玩家30"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1833,7 +1923,10 @@
"robotid": 10031,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_31",
"text": "玩家31"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1894,7 +1987,10 @@
"robotid": 10032,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_32",
"text": "玩家32"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -1955,7 +2051,10 @@
"robotid": 10033,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_33",
"text": "玩家33"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2016,7 +2115,10 @@
"robotid": 10034,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_34",
"text": "玩家34"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2077,7 +2179,10 @@
"robotid": 10035,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_35",
"text": "玩家35"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2138,7 +2243,10 @@
"robotid": 10036,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_36",
"text": "玩家36"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2199,7 +2307,10 @@
"robotid": 10037,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_37",
"text": "玩家37"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2260,7 +2371,10 @@
"robotid": 10038,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_38",
"text": "玩家38"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2321,7 +2435,10 @@
"robotid": 10039,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_39",
"text": "玩家39"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,
@ -2382,7 +2499,10 @@
"robotid": 10040,
"icon": "hbkp_js_24003",
"lvshow": 60,
"name": "dream001",
"name": {
"key": "robot_Sheet1_text_40",
"text": "玩家40"
},
"hero1": 25004,
"lv1": 60,
"star1": 6,

View File

@ -7,7 +7,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_1",
"text": "这里可以查看各种羁绊并解锁羁绊提升守护者属性"
"text": "这里可以查看各种羁绊并解锁羁绊提升守护者属性"
}
},
{
@ -18,7 +18,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_2",
"text": "这里可以查看羁绊所需守护者,解锁羁绊后可以根据好感度提升羁绊等级"
"text": "这里可以查看羁绊所需守护者,解锁羁绊后可以根据好感度提升羁绊等级"
}
},
{
@ -29,7 +29,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_3",
"text": "这里可以查看与各个守护者们的好感度"
"text": "这里可以查看与各个守护者们的好感度"
}
},
{
@ -40,7 +40,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_4",
"text": "这里可以给守护者送礼,提升与守护者的好感度"
"text": "这里可以给守护者送礼,提升与守护者的好感度"
}
},
{
@ -51,7 +51,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_5",
"text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励,完成一定数量的陪练还有格外奖励"
"text": "这里可以查看各种功夫陪练,完成陪练可以获得高额奖励,完成一定数量的陪练还有格外奖励"
}
},
{
@ -62,7 +62,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_6",
"text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,完成任务可以获得高额奖励"
"text": "这里可以选择守护者去完成陪练任务,每个陪练任务有不同的等级与阵容要求,完成任务可以获得高额奖励"
}
},
{
@ -73,7 +73,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_7",
"text": "目前功能删除"
"text": "目前功能删除"
}
},
{
@ -84,7 +84,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_8",
"text": "这里可以与其他玩家的阵容进行对决也可以挑战npc获取奖励。挑战玩家获得积分在每周结算时根据积分排名来获得奖励"
"text": "这里可以与其他玩家的阵容进行对决也可以挑战npc获取奖励。挑战玩家获得积分在每周结算时根据积分排名来获得奖励"
}
},
{
@ -95,7 +95,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_9",
"text": "这里装着你获得的所有物品"
"text": "这里装着你获得的所有物品"
}
},
{
@ -106,7 +106,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_10",
"text": "设置中可以查看守护者技能和克制关系"
"text": "设置中可以查看守护者技能和克制关系"
}
},
{
@ -117,7 +117,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_11",
"text": "反正克制就是最好的~~"
"text": "反正克制就是最好的"
}
},
{
@ -128,7 +128,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_12",
"text": "这里可以查看公告"
"text": "这里可以查看公告"
}
},
{
@ -139,7 +139,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_13",
"text": "这里可以挑战主线并赢取巨量奖励"
"text": "这里可以挑战主线并赢取巨量奖励"
}
},
{
@ -161,7 +161,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_15",
"text": "这里可以查看你获得的所有守护者们,选择守护者可以查看详细界面并且强化他们"
"text": "这里可以查看你获得的所有守护者们,选择守护者可以查看详细界面并且强化他们"
}
},
{
@ -172,7 +172,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_16",
"text": "这里可以查看你拥有的所有装备,并且可以给守护者们装备上,一件穿戴会默认选择你最好的装备穿戴给当前守护者(已穿戴装备除外)"
"text": "这里可以查看你拥有的所有装备,并且可以给守护者们装备上,一件穿戴会默认选择你最好的装备穿戴给当前守护者(已穿戴装备除外)"
}
},
{
@ -183,7 +183,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_17",
"text": "这里可以完成特殊的考核任务,熟悉守护者的特色机制"
"text": "这里可以完成特殊的考核任务,熟悉守护者的特色机制"
}
},
{
@ -194,7 +194,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_18",
"text": "这里可以使用圣桃枝招募新的守护者们\n圣桃枝可以用200钻石购买一个\n招募概率公示史诗守护者获得概率1.2%\n 完美守护者获得概率10.8%\n 稀有守护者获得概率88%"
"text": "这里可以使用圣桃枝招募新的守护者们<br>圣桃枝可以用200钻石购买一个<br>招募概率公示:<br>史诗守护者获得概率1.2%<br>完美守护者获得概率10.8%<br>稀有守护者获得概率88%"
}
},
{
@ -205,7 +205,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_19",
"text": "这里可以挑战泰坦们获得打造材料"
"text": "这里可以挑战泰坦们获得打造材料"
}
},
{
@ -216,7 +216,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_20",
"text": "这里可以狩猎各种敌人获得珍惜材料"
"text": "这里可以狩猎各种敌人获得珍惜材料"
}
},
{
@ -227,7 +227,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_21",
"text": "这里可以加入其他人的公会"
"text": "这里可以加入其他人的公会"
}
},
{
@ -238,7 +238,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_22",
"text": "这里可以创建属于自己的公会"
"text": "这里可以创建属于自己的公会"
}
},
{
@ -249,7 +249,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_23",
"text": "这里可以打败敌人获取稀有道具,打败等级越高获取道具的稀有度越高"
"text": "这里可以打败敌人获取稀有道具,打败等级越高获取道具的稀有度越高"
}
},
{
@ -260,18 +260,18 @@
},
"content": {
"key": "ruledesc_ruledesc_content_24",
"text": "这里可以查看关卡星完成条件与获胜可获得奖励"
"text": "这里可以查看关卡星完成条件与获胜可获得奖励"
}
},
{
"id": 10025,
"title": {
"key": "ruledesc_ruledesc_title_25",
"text": "星象说明"
"text": "共鸣说明"
},
"content": {
"key": "ruledesc_ruledesc_content_25",
"text": "这里可以使用星象强化你的守护者(每个守护者星象独立)"
"text": "这里可以使用共鸣强化你的守护者(每个守护者共鸣独立)。"
}
},
{
@ -282,7 +282,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_26",
"text": "这里可以使用技能强化道具强化你的守护者的技能"
"text": "这里可以使用技能强化道具强化你的守护者的技能"
}
},
{
@ -293,7 +293,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_27",
"text": "这里可以使用抽取过重复的守护者们加强该守护者"
"text": "这里可以使用抽取过重复的守护者们加强该守护者"
}
},
{
@ -304,7 +304,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_28",
"text": "这里可以消耗锻造材料打造出各种装备,打造增长熟练度,熟练度足够后会解锁下一级图纸,打造越高级的图纸获得更好的装备概率越高"
"text": "这里可以消耗锻造材料打造出各种装备,打造增长熟练度,熟练度足够后会解锁下一级图纸,打造越高级的图纸获得更好的装备概率越高"
}
},
{
@ -315,7 +315,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_29",
"text": "这里可以查看炉温,炉温是打造时的消耗品,随时间自动回复,也可以使用道具回复。 提升炉温等级可以提升炉温上限与炉温恢复速度"
"text": "这里可以查看炉温,炉温是打造时的消耗品,随时间自动回复,也可以使用道具回复。 提升炉温等级可以提升炉温上限与炉温恢复速度"
}
},
{
@ -326,7 +326,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_30",
"text": "这里可以强化锻造炉每当前一个提升至5级时解锁下一个锻造强化选项"
"text": "这里可以强化锻造炉每当前一个提升至5级时解锁下一个锻造强化选项"
}
},
{
@ -337,7 +337,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_31",
"text": "这里可以挑战功夫塔每次挑战胜利都可以获得奖励每挑战胜利10层会有特殊奖励功夫塔挑战不需要消耗物品"
"text": "这里可以挑战功夫塔每次挑战胜利都可以获得奖励每挑战胜利10层会有特殊奖励功夫塔挑战不需要消耗物品"
}
},
{
@ -348,7 +348,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_32",
"text": "这里可以查看功夫塔每层挑战成功获得的奖励与敌人配置"
"text": "这里可以查看功夫塔每层挑战成功获得的奖励与敌人配置"
}
},
{
@ -359,7 +359,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_33",
"text": "这里可以挑战每日一练获取特殊的战斗增益加成"
"text": "这里可以挑战每日一练获取特殊的战斗增益加成"
}
},
{
@ -370,7 +370,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_34",
"text": "这里可以开始每日一练,可以在左下角查看每日一练动作要领"
"text": "这里可以开始每日一练,可以在左下角查看每日一练动作要领"
}
},
{
@ -381,7 +381,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_35",
"text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得格外的木桩锻炼经验加成"
"text": "这里可以登记不同职业类别,登记类别提升后,该类别的守护者可以获得格外的木桩锻炼经验加成"
}
},
{
@ -392,7 +392,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_36",
"text": "这里可以使用左右两侧的积木,通过在木板上组合只空出相应日期的益智游戏,挑战日期为当月所有日期,完成可以获得奖励,每个月后重置"
"text": "这里可以使用左右两侧的积木,通过在木板上组合只空出相应日期的益智游戏,挑战日期为当月所有日期,完成可以获得奖励,每个月后重置"
}
},
{
@ -403,7 +403,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_37",
"text": "这里可以进入商队功能的不同界面"
"text": "这里可以进入商队功能的不同界面"
}
},
{
@ -414,7 +414,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_38",
"text": "这里可以使用虚拟货币购买不同城市的货物,在需求不同的城市中卖出来赚取更多的虚拟币,最后会根据玩家虚拟币的排名获取奖励"
"text": "这里可以使用虚拟货币购买不同城市的货物,在需求不同的城市中卖出来赚取更多的虚拟币,最后会根据玩家虚拟币的排名获取奖励"
}
},
{
@ -425,7 +425,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_39",
"text": "这里可以在该城市购买与卖出各种货物"
"text": "这里可以在该城市购买与卖出各种货物"
}
},
{
@ -436,7 +436,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_40",
"text": "这里可以利用当前背景与人物角色,利用滤镜与各种动作拍出好看的照片"
"text": "这里可以利用当前背景与人物角色,利用滤镜与各种动作拍出好看的照片"
}
},
{
@ -447,7 +447,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_41",
"text": "这里可以查看四种属性的守护者们,并且使用星图币强化这一属性的全部守护者们"
"text": "这里可以查看四种属性的守护者们,并且使用星图币强化这一属性的全部守护者们"
}
},
{
@ -458,7 +458,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_42",
"text": "这里可以可以使用星图币强化这个属性的全部守护者们"
"text": "这里可以可以使用星图币强化这个属性的全部守护者们"
}
},
{
@ -469,7 +469,18 @@
},
"content": {
"key": "ruledesc_ruledesc_content_43",
"text": "帮忙测试这个界面是否有帮助信息"
"text": "帮忙测试这个界面是否有帮助信息。"
}
},
{
"id": 10044,
"title": {
"key": "ruledesc_ruledesc_title_44",
"text": "主角个人信息界面说明"
},
"content": {
"key": "ruledesc_ruledesc_content_44",
"text": "这里可以查看玩家游戏进度并且可以修改名称与个性签名名称最多20字符汉字算2字符更改角色装扮还能修改并查看自己的阵容展示。"
}
}
]

View File

@ -135,8 +135,8 @@
"n": 1
}
],
"rtype": 3,
"rtime": 1,
"rtype": 2,
"rtime": 7,
"rnum": -1,
"rneed": [],
"shopitem": [
@ -172,8 +172,8 @@
"n": 1
}
],
"rtype": 3,
"rtime": 1,
"rtype": 2,
"rtime": 7,
"rnum": -1,
"rneed": [],
"shopitem": [
@ -203,8 +203,8 @@
"n": 1
}
],
"rtype": 4,
"rtime": 1,
"rtype": 2,
"rtime": 21,
"rnum": -1,
"rneed": [],
"shopitem": [
@ -237,8 +237,8 @@
"n": 1
}
],
"rtype": 3,
"rtime": 1,
"rtype": 2,
"rtime": 7,
"rnum": -1,
"rneed": [],
"shopitem": [

File diff suppressed because it is too large Load Diff

View File

@ -9,9 +9,9 @@
"groups": 1,
"extra": [
{
"a": "item",
"t": "11025001",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -25,9 +25,9 @@
"groups": 1,
"extra": [
{
"a": "item",
"t": "11025004",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -41,9 +41,9 @@
"groups": 1,
"extra": [
{
"a": "item",
"t": "11044005",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -57,9 +57,9 @@
"groups": 2,
"extra": [
{
"a": "item",
"t": "11025001",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -73,9 +73,9 @@
"groups": 2,
"extra": [
{
"a": "item",
"t": "11025004",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -89,9 +89,9 @@
"groups": 2,
"extra": [
{
"a": "item",
"t": "11044005",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -105,9 +105,9 @@
"groups": 3,
"extra": [
{
"a": "item",
"t": "11025001",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -121,9 +121,9 @@
"groups": 3,
"extra": [
{
"a": "item",
"t": "11025004",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
},
@ -137,9 +137,9 @@
"groups": 3,
"extra": [
{
"a": "item",
"t": "11044005",
"n": 10
"a": "attr",
"t": "gold",
"n": 1000000
}
]
}

View File

@ -1071,7 +1071,7 @@
"Argu": [
1,
4,
370
400
],
"FollowSK": [],
"SucFollowSK": [
@ -1121,7 +1121,7 @@
"Argu": [
1,
4,
370
400
],
"FollowSK": [],
"SucFollowSK": [
@ -1271,7 +1271,7 @@
"Argu": [
1,
4,
350
400
],
"FollowSK": [],
"SucFollowSK": [
@ -1369,7 +1369,7 @@
"Argu": [
1,
4,
370
400
],
"FollowSK": [],
"SucFollowSK": [
@ -1420,7 +1420,7 @@
"Argu": [
1,
4,
370
400
],
"FollowSK": [],
"SucFollowSK": [
@ -7866,7 +7866,7 @@
"Argu": [
1,
4,
900
1000
],
"FollowSK": [
215005113
@ -7891,7 +7891,7 @@
"Argu": [
1,
4,
900
1000
],
"FollowSK": [
215005113
@ -9728,7 +9728,7 @@
"Argu": [
1,
4,
300,
500,
1,
5,
1500
@ -9780,7 +9780,7 @@
"Argu": [
1,
4,
300,
500,
1,
5,
1600
@ -9832,7 +9832,7 @@
"Argu": [
1,
4,
300,
500,
1,
5,
1600
@ -9884,7 +9884,7 @@
"Argu": [
1,
4,
300,
500,
1,
5,
1700
@ -9936,7 +9936,7 @@
"Argu": [
1,
4,
300,
500,
1,
5,
1700
@ -10040,7 +10040,7 @@
"Argu": [
414007211,
-1,
-1
9999
],
"FollowSK": [],
"SucFollowSK": [],
@ -11417,7 +11417,7 @@
"Argu": [
1,
4,
900,
1000,
1,
2,
55
@ -11829,7 +11829,7 @@
"Argu": [
1,
4,
2000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -11852,7 +11852,7 @@
"Argu": [
1,
4,
2000
3500
],
"FollowSK": [],
"SucFollowSK": [],
@ -12377,7 +12377,7 @@
"Argu": [
1,
4,
2000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -12400,7 +12400,7 @@
"Argu": [
1,
4,
2200
3200
],
"FollowSK": [],
"SucFollowSK": [
@ -12449,7 +12449,7 @@
"Argu": [
1,
4,
2000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -12472,7 +12472,7 @@
"Argu": [
1,
4,
2200
3200
],
"FollowSK": [],
"SucFollowSK": [
@ -12521,7 +12521,7 @@
"Argu": [
1,
4,
1000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -12570,7 +12570,7 @@
"Argu": [
1,
4,
2800
4000
],
"FollowSK": [],
"SucFollowSK": [
@ -12619,7 +12619,7 @@
"Argu": [
1,
4,
1000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -12665,7 +12665,7 @@
"Argu": [
1,
4,
1000
2200
],
"FollowSK": [],
"SucFollowSK": [
@ -12735,7 +12735,7 @@
"Argu": [
1,
4,
2500
3000
],
"FollowSK": [],
"SucFollowSK": [
@ -13805,7 +13805,7 @@
"Argu": [
1,
4,
900
1000
],
"FollowSK": [
215001112
@ -16928,7 +16928,7 @@
"Argu": [
1,
4,
1500
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -16951,7 +16951,7 @@
"Argu": [
1,
4,
1500
3100
],
"FollowSK": [],
"SucFollowSK": [],
@ -16974,7 +16974,7 @@
"Argu": [
1,
4,
1500
3200
],
"FollowSK": [],
"SucFollowSK": [],
@ -16997,7 +16997,7 @@
"Argu": [
1,
4,
1500
3300
],
"FollowSK": [],
"SucFollowSK": [],
@ -17020,7 +17020,7 @@
"Argu": [
1,
4,
1500
3500
],
"FollowSK": [],
"SucFollowSK": [],
@ -17694,7 +17694,7 @@
"Argu": [
1,
4,
300
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -17719,7 +17719,7 @@
"Argu": [
1,
4,
400
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -17744,7 +17744,7 @@
"Argu": [
1,
4,
400
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -19217,7 +19217,7 @@
"Argu": [
1,
4,
800
1000
],
"FollowSK": [],
"SucFollowSK": [
@ -21265,7 +21265,7 @@
"Argu": [
1,
4,
300,
1500,
2,
2,
80
@ -21317,7 +21317,7 @@
"Argu": [
1,
4,
400,
1500,
2,
2,
80
@ -21345,7 +21345,7 @@
"Argu": [
1,
4,
500,
1500,
2,
2,
80
@ -21373,7 +21373,7 @@
"Argu": [
1,
4,
600,
1500,
2,
2,
80
@ -21401,7 +21401,7 @@
"Argu": [
1,
4,
700,
1500,
2,
2,
80
@ -21452,7 +21452,7 @@
"Argu": [
1,
4,
1000,
1800,
2,
2,
60
@ -21503,7 +21503,7 @@
"Argu": [
1,
4,
1100,
1900,
2,
2,
60
@ -21531,7 +21531,7 @@
"Argu": [
1,
4,
1200,
2000,
2,
2,
60
@ -21559,7 +21559,7 @@
"Argu": [
1,
4,
1300,
2100,
2,
2,
60
@ -21587,7 +21587,7 @@
"Argu": [
1,
4,
1400,
2200,
2,
2,
60
@ -21606,6 +21606,32 @@
{
"Id": 244004311,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
4,
4000
],
"FollowSK": [
244004312,
244004313
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244004312,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
@ -21628,7 +21654,7 @@
"RevisiParams": []
},
{
"Id": 244004312,
"Id": 244004313,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -21652,7 +21678,7 @@
"RevisiParams": []
},
{
"Id": 244004313,
"Id": 244004314,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -21675,7 +21701,7 @@
"RevisiParams": []
},
{
"Id": 244004314,
"Id": 244004315,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -21699,7 +21725,7 @@
"RevisiParams": []
},
{
"Id": 244004315,
"Id": 244004316,
"EmitPR": 1000,
"From": 3,
"Where": [],
@ -24245,7 +24271,7 @@
"Argu": [
1,
4,
600
1000
],
"FollowSK": [
233001113
@ -24270,7 +24296,7 @@
"Argu": [
1,
4,
600
1000
],
"FollowSK": [
233001113
@ -25132,7 +25158,7 @@
"Argu": [
1,
4,
550
1000
],
"FollowSK": [
243005312
@ -25844,10 +25870,10 @@
1,
2
],
"FollowSK": [
"FollowSK": [],
"SucFollowSK": [
213005213
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
@ -25882,7 +25908,7 @@
{
"Id": 213005214,
"EmitPR": 1000,
"From": 1,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
@ -28839,7 +28865,7 @@
"Argu": [
1,
4,
8000
4000
],
"FollowSK": [
255006112
@ -28864,7 +28890,7 @@
"Argu": [
390001401,
1000,
1,
2,
2
],
"FollowSK": [],
@ -28980,7 +29006,7 @@
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
@ -29027,7 +29053,7 @@
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
@ -29056,7 +29082,7 @@
"Argu": [
390001401,
1000,
1,
3,
3
],
"FollowSK": [],
@ -29103,7 +29129,7 @@
"Argu": [
1,
4,
10000
4000
],
"FollowSK": [],
"SucFollowSK": [
@ -29205,7 +29231,7 @@
"Argu": [
1,
4,
1500
1000
],
"FollowSK": [],
"SucFollowSK": [],
@ -29317,13 +29343,12 @@
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Type": 2,
"Argu": [
390001415,
1000,
0,
455007315,
-1,
-1
],
"FollowSK": [],
@ -29343,10 +29368,11 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Type": 3,
"Argu": [
455007314,
-1,
390001415,
1000,
10,
-1
],
"FollowSK": [],
@ -29471,7 +29497,7 @@
"Argu": [
1,
4,
500
1000
],
"FollowSK": [
253003112
@ -29927,7 +29953,7 @@
{
"Id": 200004001,
"EmitPR": 1000,
"From": 1,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
@ -30423,7 +30449,7 @@
"Argu": [
1,
4,
300,
1000,
1,
1,
45
@ -30546,7 +30572,7 @@
"Argu": [
1,
4,
900,
1000,
1,
11,
150
@ -30793,7 +30819,7 @@
"Argu": [
1,
4,
350
500
],
"FollowSK": [
234001112
@ -30891,7 +30917,7 @@
"Argu": [
1,
4,
350
400
],
"FollowSK": [
234001312
@ -32201,7 +32227,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -32224,7 +32250,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -32247,7 +32273,7 @@
"Argu": [
1,
4,
800
2500
],
"FollowSK": [
251012212
@ -32296,7 +32322,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251013112
@ -32345,7 +32371,7 @@
"Argu": [
1,
4,
1800
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -32417,7 +32443,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251014112
@ -32484,7 +32510,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -32618,7 +32644,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251011112
@ -32667,7 +32693,7 @@
"Argu": [
1,
4,
1000
3500
],
"FollowSK": [],
"SucFollowSK": [],
@ -32693,7 +32719,7 @@
"Argu": [
1,
4,
650
3500
],
"FollowSK": [
244003112
@ -32742,7 +32768,7 @@
"Argu": [
1,
4,
650
1000
],
"FollowSK": [
244003114
@ -36460,7 +36486,7 @@
"Argu": [
1,
4,
500
1200
],
"FollowSK": [
253002112
@ -36506,7 +36532,7 @@
"Argu": [
1,
4,
1800
4000
],
"FollowSK": [],
"SucFollowSK": [
@ -36576,7 +36602,7 @@
"Argu": [
1,
4,
1200
3000
],
"FollowSK": [
244002112
@ -37129,7 +37155,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251015112
@ -37199,7 +37225,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [],
"SucFollowSK": [],
@ -37269,7 +37295,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251018112
@ -37318,7 +37344,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251019112
@ -37556,7 +37582,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251024112
@ -37605,7 +37631,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251025112
@ -37654,7 +37680,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251026112
@ -37727,7 +37753,7 @@
"Argu": [
1,
4,
1000
3000
],
"FollowSK": [
251028112

View File

@ -12196,7 +12196,7 @@
},
"Desc": {
"key": "skill_skill_atk_Desc_113002311_1",
"text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害若目标死亡则附加1次攻击对随机1个目标造成攻击力150%的伤害本次攻击无视防御。追加伤害每回合最多触发2次。"
"text": "食人鱼先生对敌方1个目标造成攻击力500%的伤害若目标死亡则附加1次攻击对随机1个目标造成攻击力300%的伤害本次攻击无视防御。追加伤害每回合最多触发2次。"
},
"buffid": [],
"map": ""
@ -16455,16 +16455,16 @@
"Target": 2,
"ChildSkill": {
"Id": [
244004311,
244004312
244004311
]
},
"Desc": {
"key": "skill_skill_atk_Desc_144004311_1",
"text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态"
"text": "骇客蛛为己方全体附加2回合[color=#37d8a9]速度提升[/color]状态对所有敌方造成自身攻击力400%的伤害并附带2回合[color=#c84a32]黑客前瞻[/color]"
},
"buffid": [
390001216
390001216,
390001003
],
"map": ""
},
@ -16487,8 +16487,7 @@
"Target": 2,
"ChildSkill": {
"Id": [
244004321,
244004312
244004311
]
},
"Desc": {
@ -16496,7 +16495,8 @@
"text": "技能冷却减少1回合"
},
"buffid": [
390001216
390001216,
390001003
],
"map": ""
},
@ -16519,8 +16519,7 @@
"Target": 2,
"ChildSkill": {
"Id": [
244004331,
244004312
244004311
]
},
"Desc": {
@ -16528,7 +16527,8 @@
"text": "技能冷却减少1回合"
},
"buffid": [
390001216
390001216,
390001003
],
"map": ""
},
@ -19655,10 +19655,7 @@
"ChildSkill": {
"Id": [
213005211,
213005212,
213005213,
213005214,
213005215
213005214
]
},
"Desc": {
@ -21882,7 +21879,7 @@
"IsMelee": 0,
"act": "Skill_1",
"Type": 1,
"CD": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -22002,7 +21999,7 @@
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 0,
"CD": 2,
"Where": [
"SelfHasBuff=390001415"
],
@ -22010,7 +22007,8 @@
"ChildSkill": {
"Id": [
255007211,
255007213
255007212,
25007213
]
},
"Desc": {
@ -22034,7 +22032,7 @@
"IsMelee": 0,
"act": "",
"Type": 2,
"CD": 2,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
@ -22042,7 +22040,6 @@
255007311,
255007312,
255007313,
255007314,
255007318
]
},

View File

@ -234,7 +234,8 @@
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [
55
55,
50
],
"Effect": [
1
@ -993,7 +994,7 @@
"BuffType": 21,
"EffectArgu": [
1,
1,
2,
100
],
"BufParNum": 1,
@ -1025,7 +1026,7 @@
"BuffType": 21,
"EffectArgu": [
1,
1,
2,
50
],
"BufParNum": 1,
@ -1085,7 +1086,7 @@
"BuffType": 21,
"EffectArgu": [
2,
1,
2,
500
],
"BufParNum": 1,
@ -1237,7 +1238,7 @@
"BuffType": 21,
"EffectArgu": [
1,
1,
2,
500
],
"BufParNum": 1,
@ -2631,7 +2632,7 @@
"AddEffect": false,
"RemoveType": true,
"NotOverlay": 0,
"OverlayTimes": 1,
"OverlayTimes": 3,
"SameID": true,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_zd",
@ -3046,7 +3047,6 @@
},
"BuffType": 72,
"EffectArgu": [
250,
50
],
"BufParNum": 1,
@ -3479,7 +3479,7 @@
"AddEffect": false,
"RemoveType": true,
"NotOverlay": 0,
"OverlayTimes": 1,
"OverlayTimes": 3,
"SameID": true,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_lx",
@ -3587,7 +3587,7 @@
"BuffType": 21,
"EffectArgu": [
1,
1,
2,
220
],
"BufParNum": 1,

View File

@ -1274,7 +1274,7 @@
{
"Id": 413005211,
"When": 2,
"FromCheck": "Target=3,HasBuff=2",
"FromCheck": "Target=3,NoBuff=2",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
@ -1291,13 +1291,11 @@
"Id": 413005212,
"When": 3,
"FromCheck": "Target=3",
"TargetCheck": "Target=1",
"TargetCheck": "Target=1,HasBuff=390001001",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [
"EnemyHasBuff=390001001"
],
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -1309,13 +1307,11 @@
"Id": 413005213,
"When": 3,
"FromCheck": "Target=3",
"TargetCheck": "",
"TargetCheck": "Target=1,HasBuff=390001001",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [
"EnemyHasBuff=390001001"
],
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -2733,5 +2729,22 @@
"Callback": [
234008214
]
},
{
"Id": 455007315,
"When": 16,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "FightHpChangePas",
"MaxEmitTimes": 99,
"Callback": [
4,
255007314
]
}
]

View File

@ -5,9 +5,14 @@
"active": 40,
"reword": [
{
"a": "item",
"t": "17020001",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -19,9 +24,14 @@
"active": 80,
"reword": [
{
"a": "item",
"t": "10000003",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -33,9 +43,14 @@
"active": 120,
"reword": [
{
"a": "item",
"t": "17020001",
"n": 3
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",
@ -47,9 +62,14 @@
"active": 160,
"reword": [
{
"a": "item",
"t": "10000003",
"n": 1
"a": "attr",
"t": "diamond",
"n": 150
},
{
"a": "attr",
"t": "gold",
"n": 1000000
}
],
"action": "main_weektask_action_1_act",

View File

@ -5,14 +5,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_1",
"text": "进行5次普通招募"
"text": "本周竞技场挑战{1}次"
},
"type_id": 3018001,
"active": 40,
"type_id": 13000001,
"active": 10,
"id_after": 0,
"jump_interface": 107,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 75
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20002,
@ -20,14 +31,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_2",
"text": "为任意守护者提升5次等级"
"text": "本周竞技场挑战{1}次"
},
"type_id": 3024001,
"active": 40,
"type_id": 13000002,
"active": 10,
"id_after": 0,
"jump_interface": 103,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 100
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20003,
@ -35,14 +57,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_3",
"text": "强化任意装备成功7次"
"text": "本周竞技场挑战{1}次"
},
"type_id": 3047001,
"active": 40,
"type_id": 13000003,
"active": 10,
"id_after": 0,
"jump_interface": 102,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 125
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20004,
@ -50,14 +83,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_4",
"text": "在商店购买任意7件商品"
"text": "本周竞技场胜利{1}次"
},
"type_id": 3064001,
"active": 40,
"type_id": 13000004,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 75
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20005,
@ -65,14 +109,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_5",
"text": "使用好友助战守护者战斗7次"
"text": "本周竞技场胜利{1}次"
},
"type_id": 3012001,
"active": 40,
"type_id": 13000005,
"active": 10,
"id_after": 0,
"jump_interface": 113,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 100
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20006,
@ -80,14 +135,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_6",
"text": "刷新商店10次"
"text": "本周竞技场胜利{1}次"
},
"type_id": 3105001,
"active": 40,
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "arenacoin",
"n": 150
},
{
"a": "attr",
"t": "diamond",
"n": 50
}
]
},
{
"key": 20007,
@ -95,14 +161,25 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_7",
"text": "消费1000颗钻石"
"text": "本周累计经验副本消耗{1}体力"
},
"type_id": 3104001,
"active": 40,
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"jump_interface": 11012,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20008,
@ -110,13 +187,284 @@
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_8",
"text": "进行30场竞技场挑战"
"text": "本周累计经验副本消耗{1}体力"
},
"type_id": 3130001,
"active": 40,
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 156,
"jump_interface": 11012,
"icon": "wp_icon_0001",
"reword": []
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20009,
"id_list": 9,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_9",
"text": "本周累计经验副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 11012,
"icon": "wp_icon_0002",
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20010,
"id_list": 10,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_10",
"text": "本周累计消耗{1}点金币"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"icon": "wp_icon_0003",
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20011,
"id_list": 11,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_11",
"text": "本周累计消耗{1}点金币"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"icon": "wp_icon_0004",
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20012,
"id_list": 12,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_12",
"text": "本周累计消耗{1}点金币"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 122,
"icon": "wp_icon_0005",
"reword": [
{
"a": "attr",
"t": "diamond",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20013,
"id_list": 13,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_13",
"text": "本周累计装备副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 11012,
"icon": "wp_icon_0006",
"reword": [
{
"a": "item",
"t": "10000005",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20014,
"id_list": 14,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_14",
"text": "本周累计装备副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 11012,
"icon": "wp_icon_0007",
"reword": [
{
"a": "item",
"t": "10000005",
"n": 60
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20015,
"id_list": 15,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_15",
"text": "本周累计装备副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 11012,
"icon": "wp_icon_0008",
"reword": [
{
"a": "item",
"t": "10000005",
"n": 85
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20016,
"id_list": 16,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_16",
"text": "本周累计回响副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 168,
"icon": "wp_icon_0009",
"reword": [
{
"a": "item",
"t": "10000002",
"n": 50
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20017,
"id_list": 17,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_17",
"text": "本周累计回响副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 168,
"icon": "wp_icon_0010",
"reword": [
{
"a": "item",
"t": "10000002",
"n": 60
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
},
{
"key": 20018,
"id_list": 18,
"id_tag": 2,
"task_display": {
"key": "task_task_round_task_display_18",
"text": "本周累计回响副本消耗{1}体力"
},
"type_id": 13000006,
"active": 10,
"id_after": 0,
"jump_interface": 168,
"icon": "wp_icon_0011",
"reword": [
{
"a": "item",
"t": "10000002",
"n": 85
},
{
"a": "attr",
"t": "gold",
"n": 100000
}
]
}
]

View File

@ -10,11 +10,11 @@
"difficulty": 1,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -70,11 +70,11 @@
"difficulty": 2,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -125,11 +125,11 @@
"difficulty": 3,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -185,11 +185,11 @@
"difficulty": 4,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -240,11 +240,11 @@
"difficulty": 5,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -300,11 +300,11 @@
"difficulty": 6,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -360,11 +360,11 @@
"difficulty": 7,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -425,11 +425,11 @@
"difficulty": 8,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -485,11 +485,11 @@
"difficulty": 9,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -550,11 +550,11 @@
"difficulty": 10,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -615,11 +615,11 @@
"difficulty": 11,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -680,11 +680,11 @@
"difficulty": 12,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
44006,
24002,
15005,
45001
],
"firstprize": [
{
@ -740,11 +740,11 @@
"difficulty": 1,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -800,11 +800,11 @@
"difficulty": 2,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -855,11 +855,11 @@
"difficulty": 3,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -915,11 +915,11 @@
"difficulty": 4,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -970,11 +970,11 @@
"difficulty": 5,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1030,11 +1030,11 @@
"difficulty": 6,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1090,11 +1090,11 @@
"difficulty": 7,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1155,11 +1155,11 @@
"difficulty": 8,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1215,11 +1215,11 @@
"difficulty": 9,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1280,11 +1280,11 @@
"difficulty": 10,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1345,11 +1345,11 @@
"difficulty": 11,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1410,11 +1410,11 @@
"difficulty": 12,
"BattleReadyID": 121,
"captionrecommend": [
25001,
45003,
25004,
34006,
35001,
35002
14005,
34003,
24001
],
"firstprize": [
{
@ -1470,11 +1470,11 @@
"difficulty": 1,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1530,11 +1530,11 @@
"difficulty": 2,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1585,11 +1585,11 @@
"difficulty": 3,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1645,11 +1645,11 @@
"difficulty": 4,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1700,11 +1700,11 @@
"difficulty": 5,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1760,11 +1760,11 @@
"difficulty": 6,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1820,11 +1820,11 @@
"difficulty": 7,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1885,11 +1885,11 @@
"difficulty": 8,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -1945,11 +1945,11 @@
"difficulty": 9,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -2010,11 +2010,11 @@
"difficulty": 10,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -2075,11 +2075,11 @@
"difficulty": 11,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{
@ -2140,11 +2140,11 @@
"difficulty": 12,
"BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
34006,
35001,
35002
45003,
15005,
44006,
14005,
24003
],
"firstprize": [
{

View File

@ -9,14 +9,15 @@
"back_png": "wjyz_img003",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_1",
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
},
"icon": "wjyz_img012",
"guardskill": [
124004111,
144005111
155005111,
155005211,
155005311
],
"bossIcon": "sl_rk_boss04"
"bossIcon": "sbkp_js_55005"
},
{
"bossid": 2,
@ -28,14 +29,15 @@
"back_png": "wjyz_img001",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_2",
"text": "冰霜泰坦巨人从极寒之地而来,没有什么比它更寒冷了"
"text": "冰霜泰坦巨人从极寒之地而来,没有什么比它更寒冷了"
},
"icon": "wjyz_img011",
"guardskill": [
124004111,
144005111
155007111,
155007211,
155007311
],
"bossIcon": "sl_rk_boss04"
"bossIcon": "sbkp_js_55007"
},
{
"bossid": 3,
@ -47,14 +49,15 @@
"back_png": "wjyz_img002",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_3",
"text": "森林泰坦诞生于广袤的森林之中,是所有动物们的守护神"
"text": "森林泰坦诞生于广袤的森林之中,是所有动物们的守护神"
},
"icon": "wjyz_img013",
"guardskill": [
124004111,
144005111
155006111,
155006211,
155006311
],
"bossIcon": "sl_rk_boss04"
"bossIcon": "sbkp_js_55006"
},
{
"bossid": 11,
@ -66,14 +69,15 @@
"back_png": "wjyz_img001",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_4",
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
},
"icon": "wjyz_img011",
"guardskill": [
124004111,
144005111
155005111,
155005211,
155005311
],
"bossIcon": "sl_rk_boss04"
"bossIcon": "sbkp_js_55005"
},
{
"bossid": 21,
@ -85,28 +89,29 @@
"back_png": "wjyz_img002",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_5",
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
"text": "熔岩泰坦巨人来自于遥远的火山,它的火焰属性使得所到之处,一片荒芜"
},
"icon": "wjyz_img013",
"guardskill": [
124004111,
144005111
155005111,
155005211,
155005311
],
"bossIcon": "sl_rk_boss02"
"bossIcon": "sbkp_js_55005"
},
{
"bossid": 31,
"copytype": 4,
"name": {
"key": "vikingexpedition_bossskill_name_6",
"text": "阿宝"
"text": "经验副本"
},
"back_png": "xmwg_jyfb_boss1",
"introduce": {
"key": "vikingexpedition_bossskill_introduce_6",
"text": "一只来自于中国的滚滚"
"text": "经验副本,产出经验材料"
},
"icon": "action_11001",
"icon": "ytx_js_25001",
"guardskill": [
125001111,
125001211

View File

@ -22,7 +22,7 @@
"id": 20,
"name": {
"key": "worldtask_world_all_name_2",
"text": "章节2:大龙复仇记"
"text": "章节2:大龙归来"
},
"task_icon": "",
"task_txt": {
@ -60,7 +60,7 @@
"id": 40,
"name": {
"key": "worldtask_world_all_name_4",
"text": "章节4:黑市风波"
"text": "章节4:交易所风波"
},
"task_icon": "",
"task_txt": {

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -449,6 +449,7 @@ const (
Reddot17102 ReddotType = 17102 // 铁匠铺手册台
Reddot17106 ReddotType = 17106 // 铁匠铺手册台收藏家奖励上
Reddot17107 ReddotType = 17107 // 铁匠铺手册台收藏家奖励按钮上
Reddot17108 ReddotType = 17108 // 铁匠铺炉温回复时间
//竞技场
Reddot22100 ReddotType = 22100 //当玩家竞技场可挑战次数到达最大时
Reddot22102 ReddotType = 22102 //当竞技场npc可以挑战时
@ -699,6 +700,7 @@ const (
Rtype188 TaskType = 188 //玩家创建1个工会
Rtype189 TaskType = 189 //铁匠铺进行一次定制
Rtype199 TaskType = 199 //回想多少次
Rtype200 TaskType = 200 //在狩猎内战斗X次
)
const (

View File

@ -55,7 +55,7 @@ type (
///添加单个物品到背包 (可以加物品和减物品)
AddItem(session IUserSession, itemid string, addnum int32, bPush bool) (errdata *pb.ErrorData)
///添加多个物品到背包 (可以加物品和减物品)
AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData)
AddItems(session IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData)
///清理道具
CleanItems(session IUserSession) (errdata *pb.ErrorData)
///购买统一入场券

View File

@ -0,0 +1,28 @@
package activity
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
//参数校验
func (this *apiComp) GetHdDataCheck(session comm.IUserSession, req *pb.ActivityGetHdDataReq) (errdata *pb.ErrorData) {
return
}
func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdDataReq) (errdata *pb.ErrorData) {
list, err := this.module.modelhdData.getHddata(session.GetUserId())
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
}
return
}
session.SendMsg(string(this.module.GetType()), "gethddata", &pb.ActivityGetHdDataResp{
Data: list,
})
return
}

View File

@ -6,17 +6,16 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
type modelActivity struct {
type modelhdData struct {
modules.MCompModel
module *Activity
}
func (this *modelActivity) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
func (this *modelhdData) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.TableName = string(comm.TableHdData)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Activity)
@ -24,30 +23,31 @@ func (this *modelActivity) Init(service core.IService, module core.IModule, comp
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "hdid", Value: bsonx.Int32(1)}},
})
return
}
func (this *modelActivity) getActivityList(uid string) (result *pb.DBActivityData, err error) {
result = &pb.DBActivityData{
Uid: uid,
Hid: 0,
Gotarr: []int32{},
Lasttime: 0,
Val: 0,
}
if err = this.Get(uid, result); err != nil {
if mongo.ErrNoDocuments == err {
result.Id = primitive.NewObjectID().Hex()
result.Uid = uid
this.Add(uid, result)
err = nil
}
// 获取用户活动数据
func (this *modelhdData) getHddata(uid string) (result []*pb.DBActivityData, err error) {
result = make([]*pb.DBActivityData, 0)
if err = this.GetList(uid, &result); err != nil {
this.module.Errorf("err:%v", err)
return
}
return
}
func (this *modelActivity) modifyActivityList(uid string, data map[string]interface{}) error {
return this.Change(uid, data)
// 新增一条活动数据
func (this *modelhdData) Insert(uid string, data *pb.DBActivityData) (err error) {
if err = this.AddList(uid, data.Id, data); err != nil {
this.module.Errorf("err:%v", err)
return
}
return
}
func (this *modelhdData) modifyActivityList(uid string, oid string, data map[string]interface{}) error {
return this.ChangeList(uid, oid, data)
}

View File

@ -5,6 +5,9 @@ import (
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
type modelHdList struct {
@ -16,7 +19,12 @@ func (this *modelHdList) Init(service core.IService, module core.IModule, comp c
this.TableName = string(comm.TableHdList)
err = this.MCompModel.Init(service, module, comp, options)
this.module = module.(*Activity)
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "hdid", Value: bsonx.Int32(1)}},
})
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
})
return
}

View File

@ -14,9 +14,10 @@ type Activity struct {
modules.ModuleBase
api *apiComp
configure *configureComp
modelActivity *modelActivity
service core.IService
modelhdList *modelHdList
modelhdData *modelhdData
}
func NewModule() core.IModule {
@ -48,7 +49,7 @@ func (this *Activity) OnInstallComp() {
this.ModuleBase.OnInstallComp()
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
this.modelActivity = this.RegisterComp(new(modelActivity)).(*modelActivity)
this.modelhdData = this.RegisterComp(new(modelhdData)).(*modelhdData)
this.modelhdList = this.RegisterComp(new(modelHdList)).(*modelHdList)
}

View File

@ -5,9 +5,7 @@ import (
"go_dreamfactory/lego/sys/mgo"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math/rand"
"time"
)
// 参数校验
@ -22,23 +20,14 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
global *cfg.GameGlobalData
info *pb.DBArenaUser
user *pb.DBUser
model *db.DBModel
err error
)
if errdata = this.InfoCheck(session, req); errdata != nil {
return
}
if model, err = this.module.GetDBNodule(session, comm.TableUser, time.Hour); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
user = &pb.DBUser{}
if err = model.Get(session.GetUserId(), user); err != nil {
user = this.module.ModuleUser.GetUser(session.GetUserId())
if user == nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

View File

@ -3,9 +3,7 @@ package equipment
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"math/rand"
)
// 参数校验
@ -19,7 +17,7 @@ func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashR
return
}
//锻造
// 洗练
func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
@ -66,15 +64,18 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
}
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
r := rand.New(rand.NewSource(configure.Now().Unix()))
for i, v := range r.Perm(len(equip.AdverbEntry)) {
for i, v := range comm.RandShuffle(len(attrlibrarys)) {
if i < len(equip.AdverbEntry) {
adverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.AdverbEntry[i].Lv,
AttrName: attrlibrarys[v].Attrkey,
BaseValue: attrlibrarys[v].Attrvar,
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].AttrvarCorrect)),
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)),
}
} else {
break
}
}
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1)

View File

@ -9,6 +9,7 @@ import (
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math"
"math/big"
"go.mongodb.org/mongo-driver/bson/primitive"
@ -362,12 +363,12 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.GameEquipData, intensify *cfg.GameEquipIntensifyData) (err error) {
equipment.Lv++
equipment.MainEntry.Lv++
var mainconfigure *cfg.GameEquipAttrlibrarySData
if mainconfigure, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.MainEntry.Id); err != nil {
this.module.Errorf("升级服务错误 读取主词条配置错误!")
return
}
equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(mainconfigure.AttrvarCorrect)*float64(intensify.Bonus)/1000.0)
// var mainconfigure *cfg.GameEquipAttrlibrarySData
// if mainconfigure, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.MainEntry.Id); err != nil {
// this.module.Errorf("升级服务错误 读取主词条配置错误!")
// return
// }
equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(math.Floor(float64(equipment.MainEntry.BaseValue*intensify.Bonus)/1000.0))
if intensify.Activation { //不触发副词条变化
if len(equipment.AdverbEntry) < 4 { //去随机副词条
var (

View File

@ -90,7 +90,6 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
errdata = &pb.ErrorData{
Code: pb.ErrorCode_HeroNoExist,
Title: pb.ErrorCode_HeroNoExist.ToString(),
Message: err.Error(),
}
return
}
@ -115,7 +114,6 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TalentRepeatLearn, // 重复激活
Title: pb.ErrorCode_TalentRepeatLearn.ToString(),
Message: err.Error(),
}
return
}
@ -125,7 +123,6 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
errdata = &pb.ErrorData{
Code: pb.ErrorCode_TalentUnLockerBefore, // 前置技能不满足
Title: pb.ErrorCode_TalentUnLockerBefore.ToString(),
Message: err.Error(),
}
return
}

View File

@ -935,13 +935,13 @@ func (this *ModelHero) SetHeroFetterProperty(hero *pb.DBHero, attr []*cfg.Gameat
value := key.N
switch key.A {
case comm.Hp:
hero.Fetters[comm.Hp] += int32(value)
hero.Fetters[comm.Hp] += value
case comm.Def:
hero.Fetters[comm.Def] += int32(value)
hero.Fetters[comm.Def] += value
case comm.Atk:
hero.Fetters[comm.Atk] += int32(value)
hero.Fetters[comm.Atk] += value
case comm.Speed:
hero.Fetters[comm.Speed] += int32(value)
hero.Fetters[comm.Speed] += value
case comm.HpPro:
hero.Fetters[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
case comm.AtkPro:

View File

@ -168,6 +168,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype172, 1))
}
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype83, 1, req.BossType, req.Difficulty))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype200, 1))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)
return
}

View File

@ -374,10 +374,10 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
err = NoFoundItemConfig
return
}
if conf.UpperLimit == 0 {
err = fmt.Errorf("item UpperLimit is 0")
return
}
// if conf.UpperLimit == 0 {
// err = fmt.Errorf("item UpperLimit is 0")
// return
// }
isNew = true
leftnum = int64(addnum)
add = make([]*pb.DB_UserItemData, 0)
@ -390,10 +390,12 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
num = int64(v.Amount) + int64(leftnum)
if num < 0 {
leftnum += int64(v.Amount)
v.Change = -1 * int32(v.Amount)
v.Amount = 0
del = append(del, v)
} else if num > 0 && num < int64(v.Amount) {
leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num)
update = append(update, v)
break
@ -401,6 +403,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
if conf.UpperLimit > 0 {
if num <= int64(conf.UpperLimit) {
leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num)
update = append(update, v)
break
@ -413,6 +416,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
}
} else {
leftnum = 0
v.Change = int32(num) - int32(v.Amount)
v.Amount = uint32(num)
update = append(update, v)
}
@ -429,11 +433,12 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
if leftnum > 0 { //还没有放完 寻找空的格子填充
index := int32(len(items))
for leftnum > 0 { //需要补充格子
if conf.UpperLimit < 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
if conf.UpperLimit == 0 || (conf.UpperLimit > 0 && leftnum <= int64(conf.UpperLimit)) {
grid := &pb.DB_UserItemData{
GridId: primitive.NewObjectID().Hex(),
UId: uid,
ItemId: itemId,
Change: int32(leftnum),
Amount: uint32(leftnum),
CTime: configure.Now().Unix(),
IsNewItem: isNew,
@ -451,6 +456,7 @@ func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserIte
GridId: primitive.NewObjectID().Hex(),
UId: uid,
ItemId: itemId,
Change: int32(conf.UpperLimit),
Amount: uint32(conf.UpperLimit),
CTime: configure.Now().Unix(),
IsNewItem: isNew,

View File

@ -162,14 +162,16 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3
}
// /添加多个物品到背包 (可以加物品和减物品)
func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, errdata *pb.ErrorData) {
func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.UserAtno, errdata *pb.ErrorData) {
var (
tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
_change []*pb.DB_UserItemData
err error
)
defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
if change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
change = make([]*pb.UserAtno, 0)
if _change, err = this.modelItems.AddItemsToUserPack(session.GetUserId(), items); err != nil {
this.Errorf("给用户添加物品 uId:%s items:%v err:%v", session.GetUserId(), items, err)
if err == ItemNotEnoughError {
errdata = &pb.ErrorData{
@ -198,8 +200,16 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
}
return
}
if len(change) > 0 && bPush {
this.itemsChangePush(session, change) //推送道具背包变化
for _, v := range _change {
change = append(change, &pb.UserAtno{
A: comm.ItemType,
T: v.ItemId,
N: v.Change,
O: v.GridId,
})
}
if len(_change) > 0 && bPush {
this.itemsChangePush(session, _change) //推送道具背包变化
}
for k, v := range items {
if v > 0 {

View File

@ -83,10 +83,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
return
}
this.module.modelMline.modifyMlineData(session.GetUserId(), curChapter.Id, update)
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_BattleNoWin, // 战斗失败了
// Title: pb.ErrorCode_BattleNoWin.ToString(),
// }
rsp.Data = curChapter
session.SendMsg(string(this.module.GetType()), MlineChallengeOverResp, rsp) // 数据推送
return
@ -192,6 +189,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
if errdata = this.module.DispenseRes(session, lotteryward, true); errdata != nil {
this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
}
for _, v := range lotteryward {
rsp.Reward = append(rsp.Reward, &pb.UserAssets{
A: v.A,
T: v.T,
N: v.N,
})
}
}
// 加英雄经验
@ -204,6 +208,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
}
}
}
rsp.HeroExp = stageConf.HeroExp
rsp.UserExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs)
this.module.modelMline.modifyMlineData(session.GetUserId(), curChapter.Id, update)
rsp.Data = curChapter

View File

@ -368,7 +368,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn
case comm.ItemType:
items[v.T] -= v.N
default:
this.Errorf("not found res type") // 找不到资源类型
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
}
// 校验数量
@ -467,7 +467,7 @@ func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameat
case comm.PerType:
per[v.T] = 1
default:
this.Errorf("not found res type") // 找不到资源类型
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
}
@ -667,7 +667,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
case comm.VipType:
vip[v.T] += v.N
default:
this.Error("not found res type") // 找不到资源类型
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
}
@ -684,16 +684,10 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
}
}
if len(items) > 0 { //道具资源
addItems, code := this.ModuleItems.AddItems(session, items, bPush)
this.Debugf("发放道具资源: %v [%v]", items, code)
for _, v := range addItems {
atno = append(atno, &pb.UserAtno{
A: "item",
T: v.ItemId,
N: int32(len(items)),
O: v.GridId,
})
}
_atno, code := this.ModuleItems.AddItems(session, items, bPush)
errdata = code
atno = append(atno, _atno...)
this.Debugf("发放道具资源: %v [%v]", _atno, code)
}
if len(heros) > 0 { //卡片资源
hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush)
@ -739,7 +733,7 @@ func (this *ModuleBase) FormatRes(res []*cfg.Gameatn) (ret []*cfg.Gameatn) {
case comm.ItemType:
items[v.T] += v.N
default:
this.Errorf("not found res type") // 找不到资源类型
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
}
for k, v := range attrs {

View File

@ -152,7 +152,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
return
}
}
go this.ModuleHero.RechargeMoney(args.Uid, conf.Amount)
go this.ModuleHero.RechargeMoney(args.Uid, args.Price)
return
}

View File

@ -11,7 +11,7 @@ func (this *apiComp) GymConfirmCheck(session comm.IUserSession, req *pb.Practice
return
}
///练功请求
// /每日一练确认
func (this *apiComp) GymConfirm(session comm.IUserSession, req *pb.PracticeGymConfirmReq) (errdata *pb.ErrorData) {
this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{

View File

@ -13,7 +13,7 @@ func (this *apiComp) GymInfoCheck(session comm.IUserSession, req *pb.PracticeGym
return
}
///练功请求
// /获取每日一练信息
func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoReq) (errdata *pb.ErrorData) {
var (
err error
@ -33,6 +33,7 @@ func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoR
"gymrefresh": room.Gymrefresh,
})
}
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype185, 1))
session.SendMsg(string(this.module.GetType()), "gyminfo", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh})
return
}

View File

@ -14,7 +14,7 @@ func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.Practice
return
}
///练功请求
// /刷新动作
func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (errdata *pb.ErrorData) {
var (
err error

View File

@ -109,7 +109,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
leftrefnum = shopconf.Rnum
}
tdata = time.Since(time.Unix(sdata.LastRefreshTime, 0))
tdata = configure.Now().Sub((time.Unix(sdata.LastRefreshTime, 0)))
switch shopconf.Rtype {
case 1:
ltime = time.Hour * time.Duration(shopconf.Rtime)
@ -125,7 +125,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
break
}
if req.IsManualRefresh && shopconf.Rtype == 1 { //可以手动刷新
if req.IsManualRefresh && shopconf.Rnum > 0 { //可以手动刷新
isrefresh := false
refresh := int(this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2))
if refresh > 0 { //

View File

@ -315,6 +315,20 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
rsp.Data = stove
session.SendMsg(string(this.module.GetType()), "forgeequip", rsp)
// 炉温恢复时间红点推送
i, err := this.module.service.GetModule(comm.ModuleReddot)
if err != nil {
this.module.Error(err.Error())
return
}
if b, y := i.(comm.IReddot); y {
b.PushReddot(session, &pb.ReddotItem{
Rid: int32(comm.Reddot17108),
Nextchanagetime: stove.RecoveTime,
})
}
//session.SendMsg(string(this.GetType()), "change", &pb.ReddotChangePush{Rids: reddot})
// 校验图鉴信息
this.module.modelAtlas.CheckActivateEquipAtlas(session.GetUserId(), rsp.Equip, preHitCount)
var equip map[int32]int32 // key xingji value 数量

View File

@ -72,6 +72,19 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (err
update["temperature"] = stove.Temperature
this.module.modelStove.updateSmithyStove(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove})
// 炉温恢复时间红点推送
i, err := this.module.service.GetModule(comm.ModuleReddot)
if err != nil {
this.module.Error(err.Error())
return
}
if b, y := i.(comm.IReddot); y {
b.PushReddot(session, &pb.ReddotItem{
Rid: int32(comm.Reddot17108),
Nextchanagetime: stove.RecoveTime,
})
}
tasks := make([]*pb.BuriedParam, 0)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype175, stove.Temperature))
this.module.ModuleBuried.TriggerBuried(session.GetUserId(), tasks...)

View File

@ -236,3 +236,10 @@ func (this *modelStove) CheckUnlockSuid(reelId, lv, dropid int32) int32 {
return dropid
}
func (this *modelStove) checkReddot17108(uid string) int64 {
list, _ := this.module.modelStove.getSmithyStoveList(uid)
if list.RecoveTime == 0 {
return configure.Now().Unix()
}
return list.RecoveTime
}

View File

@ -138,7 +138,12 @@ func (this *Smithy) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (r
Activated: this.modelTask.checkReddot17107(session.GetUserId()),
}
break
case comm.Reddot17108: // 铁匠铺炉温恢复
reddot[comm.Reddot17108] = &pb.ReddotItem{
Rid: int32(comm.Reddot17108),
Nextchanagetime: this.modelStove.checkReddot17108(session.GetUserId()),
}
break
}
}

View File

@ -2,6 +2,7 @@ package sociaty
import (
"errors"
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
@ -11,6 +12,7 @@ import (
"go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/wordfilter"
)
// 公会创建
@ -35,6 +37,27 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.SociatyCreateReq)
return
}
//铭感词校验 工会名称
if iscompliance, inscriptionwords := wordfilter.Validate(req.Name); !iscompliance {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SociatyNameInscriptionWords,
Title: pb.ErrorCode_SociatyNameInscriptionWords.ToString(),
Message: fmt.Sprintf("工会名称包含铭感词:%s", inscriptionwords),
}
return
}
//铭感词校验 工会公告
if len(req.Notice) > 0 {
if iscompliance, inscriptionwords := wordfilter.Validate(req.Notice); !iscompliance {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SociatyNoticeInscriptionWords,
Title: pb.ErrorCode_SociatyNoticeInscriptionWords.ToString(),
Message: fmt.Sprintf("工会公告包含铭感词:%s", inscriptionwords),
}
return
}
}
uid := session.GetUserId()
user := this.module.ModuleUser.GetUser(uid)
if user == nil {

View File

@ -1,6 +1,7 @@
package task
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
@ -16,10 +17,15 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceive
} else if req.TaskTag == 0 {
code = pb.ErrorCode_TaskTagEmpty
}
if code != 0 {
errdata = &pb.ErrorData{
Code: code,
Title: code.ToString(),
Message: fmt.Sprintf("Id:%v tag:%v", req.Id, req.TaskTag),
}
}
return
}

View File

@ -81,7 +81,6 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
this.Stype = make(map[int64]int32, 0)
this.SNum = make(map[int64]int32, 0)
configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData)
return
}
@ -168,7 +167,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
// 随机小组id
for _, v := range this._lotteryType1[lotteryId] {
if _data := this.GetLotterConfById(v); _data != nil {
if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件
if (_data.Playerlvmax == 0 || (_data.Playerlvmin <= lv && lv <= _data.Playerlvmax)) && (_data.VIPmax == 0 || (_data.VIPmin <= vipLv && vipLv <= _data.VIPmax)) { // 过滤等级等条件
if _, ok := gourp[_data.Groupid]; !ok {
gourp[_data.Groupid] = _data.Groupwt // 小组ID 权重赋值
szW = append(szW, _data.Groupwt)
@ -211,7 +210,7 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
for _, v := range this._groupType2[key] {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
fmt.Printf("大组类型1小组类型2获得道具 :%v, 该道具Cid:%d", _data.Itemid, v)
if _data.Itemwt >= comm.GetRandNum(1, 1000) { // 命中
if _data.Itemwt >= comm.GetRandNum(0, 1000) { // 命中
count := comm.GetRandNum(_data.Min, _data.Max)
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
@ -226,19 +225,18 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
} else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落,每个小组都会随机一次是否会掉落(单位为千分比)
// 每个小组id 都随机取一次
var szGroupID []int32 // 获得的权重数组
gourp := make(map[int32]*cfg.GameLotteryData, 0) // key 小组ID value 权重
gourp := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重
for _, v := range this._lotteryType2[lotteryId] {
if _data := this.GetLotterConfById(v); _data != nil {
if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件
if _, ok := gourp[_data.Groupid]; !ok {
gourp[_data.Groupid] = _data // 小组ID 权重赋值
}
if (_data.Playerlvmax == 0 || (_data.Playerlvmin <= lv && lv <= _data.Playerlvmax)) && (_data.VIPmax == 0 || (_data.VIPmin <= vipLv && vipLv <= _data.VIPmax)) { // 过滤等级等条件
gourp = append(gourp, _data)
}
}
}
// 类型为2 可能会同时获得多个组id
for k, v := range gourp {
for _, v := range gourp {
k := v.Groupid
fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id)
if v.Itemwt >= comm.GetRandNum(0, 1000) { // 命中
szGroupID = append(szGroupID, k)

View File

@ -140,7 +140,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
res = append(res, v)
}
}
res = append(res, vikingCfg.Manexp...) //给玩家加经验
if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil {
return
}
@ -152,6 +152,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
for _, v := range req.Report.Info.Redflist[0].Team {
if vikingCfg.Heroexp > 0 && !v.Ishelp { // 助战英雄不加经验
this.module.ModuleHero.AddHeroExp(session, v.Oid, vikingCfg.Heroexp)
changExp[v.HeroID] = vikingCfg.Heroexp
}
if v.Ishelp {
bHelp = true

View File

@ -329,7 +329,7 @@ type DBActivityData 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"`
Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"`
Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"`
Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"`
Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"`
Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"`
@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string {
return ""
}
func (x *DBActivityData) GetHid() int32 {
func (x *DBActivityData) GetHdid() int32 {
if x != nil {
return x.Hid
return x.Hdid
}
return 0
}
@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{
0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04,
0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74,
0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61,
0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61,
0x74, 0x61, 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, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72,
0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a,
0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61,
0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61,
0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72,
0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03,
0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -87,7 +87,7 @@ const (
ErrorCode_UserMerchantNoEnough ErrorCode = 1029 //虚拟币不足
ErrorCode_UserLvNoEnough ErrorCode = 1030 //等级不足
ErrorCode_UserStarCoinNoEnough ErrorCode = 1031 //星座币不足
ErrorCode_UserNickSensitive ErrorCode = 1032 //昵称包含敏感词
ErrorCode_UserNickSensitive ErrorCode = 1032 //包含敏感词
// friend
ErrorCode_FriendNotSelf ErrorCode = 1100 //不能是自己
ErrorCode_FriendSelfMax ErrorCode = 1101 //超出好友最大数量
@ -300,6 +300,8 @@ const (
ErrorCode_SociatyApplyLvLimit ErrorCode = 3043 //超出最大申请等级限制
ErrorCode_SociatyApplyCancel ErrorCode = 3044 //申请取消了
ErrorCode_SociatyNoticeTextLen ErrorCode = 3045
ErrorCode_SociatyNameInscriptionWords ErrorCode = 3046 //工会名称包含铭感词
ErrorCode_SociatyNoticeInscriptionWords ErrorCode = 3047 //工会公告包含铭感词
// arena
ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限
ErrorCode_ArenaTicketNotEnough ErrorCode = 3102 //票据不足
@ -659,6 +661,8 @@ var (
3043: "SociatyApplyLvLimit",
3044: "SociatyApplyCancel",
3045: "SociatyNoticeTextLen",
3046: "SociatyNameInscriptionWords",
3047: "SociatyNoticeInscriptionWords",
3101: "ArenaTicketBuyUp",
3102: "ArenaTicketNotEnough",
3103: "ArenaTicketNpcInCd",
@ -999,6 +1003,8 @@ var (
"SociatyApplyLvLimit": 3043,
"SociatyApplyCancel": 3044,
"SociatyNoticeTextLen": 3045,
"SociatyNameInscriptionWords": 3046,
"SociatyNoticeInscriptionWords": 3047,
"ArenaTicketBuyUp": 3101,
"ArenaTicketNotEnough": 3102,
"ArenaTicketNpcInCd": 3103,
@ -1117,7 +1123,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, 0x83, 0x3e, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x6f, 0x2a, 0xc9, 0x3e, 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, 0x14, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@ -1482,139 +1488,143 @@ var file_errorcode_proto_rawDesc = []byte{
0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63,
0x65, 0x6c, 0x10, 0xe4, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x65, 0x6e, 0x10, 0xe5, 0x17,
0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42,
0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61,
0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65,
0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54,
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e,
0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72,
0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e,
0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10,
0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65,
0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f,
0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54,
0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16,
0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d,
0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18,
0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52,
0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x72, 0x6f, 0x6c,
0x6c, 0x43, 0x69, 0x74, 0x79, 0x10, 0xea, 0x19, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x72, 0x6f, 0x6c,
0x6c, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xeb, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c,
0x6c, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xec, 0x19,
0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x43, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x53,
0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x10, 0xed, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72,
0x6f, 0x6c, 0x6c, 0x43, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
0x79, 0x10, 0xee, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70,
0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12,
0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74,
0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72,
0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10,
0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52,
0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56,
0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c,
0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12,
0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10,
0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65,
0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77,
0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92,
0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f,
0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61,
0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c,
0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70,
0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19,
0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74,
0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb,
0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57,
0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10,
0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c,
0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d,
0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f,
0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a,
0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65,
0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d,
0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74,
0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a,
0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63,
0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1a, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10,
0xe3, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73,
0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10,
0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74,
0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72,
0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52,
0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 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, 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, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78,
0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13,
0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61,
0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c,
0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d,
0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10,
0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b,
0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a,
0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69,
0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12,
0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76,
0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53,
0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c,
0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c,
0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12,
0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45,
0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63,
0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9,
0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46,
0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74,
0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68,
0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48,
0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18,
0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78,
0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70,
0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee,
0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46,
0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69,
0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75,
0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63,
0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a,
0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21,
0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69,
0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61,
0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1,
0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61, 0x72,
0x67, 0x65, 0x74, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12,
0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f,
0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65, 0x10,
0xb2, 0x22, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x4e, 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73,
0x10, 0xb3, 0x22, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x61,
0x72, 0x67, 0x65, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x65, 0x64, 0x10, 0xb4, 0x22, 0x12, 0x19, 0x0a,
0x14, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e,
0x74, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x75,
0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c,
0x76, 0x10, 0x96, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73,
0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f,
0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10,
0xfa, 0x23, 0x12, 0x16, 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4c, 0x65,
0x76, 0x65, 0x6c, 0x4f, 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x6c,
0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f,
0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x4f,
0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x46, 0x69, 0x6e, 0x69,
0x73, 0x68, 0x65, 0x64, 0x10, 0xfd, 0x23, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x49,
0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x10,
0xe6, 0x17, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x74,
0x69, 0x63, 0x65, 0x49, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x57, 0x6f,
0x72, 0x64, 0x73, 0x10, 0xe7, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54,
0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a,
0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45,
0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e,
0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f,
0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61,
0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c,
0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a,
0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42,
0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65,
0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12,
0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5,
0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61,
0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78,
0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11,
0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70,
0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x0e,
0x0a, 0x09, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x43, 0x69, 0x74, 0x79, 0x10, 0xea, 0x19, 0x12, 0x0e,
0x0a, 0x09, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xeb, 0x19, 0x12, 0x16,
0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x6f, 0x45, 0x6e, 0x6f,
0x75, 0x67, 0x68, 0x10, 0xec, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x43,
0x69, 0x74, 0x79, 0x55, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x10, 0xed, 0x19,
0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x43, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x52,
0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0xee, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f,
0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64,
0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f,
0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a,
0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74,
0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76,
0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae,
0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10,
0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72,
0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52,
0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77,
0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17,
0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63,
0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75,
0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c,
0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65,
0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64,
0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14,
0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12,
0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63,
0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64,
0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc,
0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69,
0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c,
0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65,
0x10, 0xdf, 0x1d, 0x12, 0x1f, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
0x64, 0x10, 0xe0, 0x1d, 0x12, 0x1d, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x10, 0xe2, 0x1d, 0x12, 0x1a, 0x0a, 0x15,
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0xe3, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64,
0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f,
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12,
0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61,
0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69,
0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13,
0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74,
0x75, 0x72, 0x65, 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, 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, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69,
0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72,
0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61,
0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69,
0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20,
0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c,
0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74,
0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73,
0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12,
0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c,
0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e,
0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91,
0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f,
0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53,
0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10,
0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61,
0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44,
0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61,
0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61,
0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16,
0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f,
0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73,
0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65,
0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68,
0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17,
0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61,
0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20,
0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f,
0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50,
0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67,
0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53,
0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10,
0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69,
0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14,
0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, 0x69, 0x65, 0x63, 0x75,
0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74,
0x69, 0x63, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69,
0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a,
0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76,
0x65, 0x72, 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b,
0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4e, 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69,
0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0xb3, 0x22, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x61, 0x72,
0x6b, 0x6f, 0x75, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x65, 0x64,
0x10, 0xb4, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f,
0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a,
0x0a, 0x15, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72,
0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x76, 0x10, 0x96, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c,
0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9,
0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e,
0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfa, 0x23, 0x12, 0x16, 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74,
0x69, 0x6d, 0x65, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4f, 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23,
0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c,
0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc,
0x23, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41,
0x6c, 0x6c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfd, 0x23, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -30,10 +30,11 @@ type DB_UserItemData struct {
UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id
ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id
Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量
CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量
CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间
ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间
IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的
Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间
}
func (x *DB_UserItemData) Reset() {
@ -96,6 +97,13 @@ func (x *DB_UserItemData) GetAmount() uint32 {
return 0
}
func (x *DB_UserItemData) GetChange() int32 {
if x != nil {
return x.Change
}
return 0
}
func (x *DB_UserItemData) GetCTime() int64 {
if x != nil {
return x.CTime
@ -128,21 +136,22 @@ var File_items_items_db_proto protoreflect.FileDescriptor
var file_items_items_db_proto_rawDesc = []byte{
0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73,
0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72,
0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64,
0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d,
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20,
0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54,
0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65,
0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20,
0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18,
0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52,
0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05,
0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69,
0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28,
0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65,
0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e,
0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70,
0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -402,6 +402,7 @@ type MlineChallengeOverResp struct {
Data *DBMline `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` //当前章节信息
Reward []*UserAssets `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` // 奖励
UserExp int32 `protobuf:"varint,3,opt,name=userExp,proto3" json:"userExp"`
HeroExp int32 `protobuf:"varint,4,opt,name=heroExp,proto3" json:"heroExp"`
}
func (x *MlineChallengeOverResp) Reset() {
@ -457,6 +458,13 @@ func (x *MlineChallengeOverResp) GetUserExp() int32 {
return 0
}
func (x *MlineChallengeOverResp) GetHeroExp() int32 {
if x != nil {
return x.HeroExp
}
return 0
}
// 扫荡关卡
type MlineCleanStageReq struct {
state protoimpl.MessageState
@ -599,24 +607,25 @@ var file_mline_mline_msg_proto_rawDesc = []byte{
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x25,
0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x75, 0x0a, 0x16, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x68,
0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e,
0x44, 0x42, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x23, 0x0a,
0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x03, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x22, 0x2e, 0x0a, 0x12,
0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x52,
0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x22, 0x54, 0x0a, 0x13,
0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x52,
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x23, 0x0a,
0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61,
0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x8f, 0x01, 0x0a, 0x16, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x43,
0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
0x12, 0x1c, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08,
0x2e, 0x44, 0x42, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x23,
0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77,
0x61, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x12, 0x18, 0x0a,
0x07, 0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x68, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x22, 0x2e, 0x0a, 0x12, 0x4d, 0x6c, 0x69, 0x6e, 0x65,
0x43, 0x6c, 0x65, 0x61, 0x6e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a,
0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x22, 0x54, 0x0a, 0x13, 0x4d, 0x6c, 0x69, 0x6e, 0x65,
0x43, 0x6c, 0x65, 0x61, 0x6e, 0x53, 0x74, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18,
0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

View File

@ -30,6 +30,7 @@ type CacheUser struct {
ServiceTag string `protobuf:"bytes,3,opt,name=ServiceTag,proto3" json:"ServiceTag" bson:"serviceTag"` //所在服务集群 区服id
GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId" bson:"gatewayServiceId"` //所在网关服务id
Ip string `protobuf:"bytes,5,opt,name=ip,proto3" json:"ip" bson:"ip"` //远程ip
Timestamp int64 `protobuf:"varint,6,opt,name=timestamp,proto3" json:"timestamp" bson:"timestamp"` //
}
func (x *CacheUser) Reset() {
@ -99,6 +100,13 @@ func (x *CacheUser) GetIp() string {
return ""
}
func (x *CacheUser) GetTimestamp() int64 {
if x != nil {
return x.Timestamp
}
return 0
}
type DBUser struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -713,11 +721,74 @@ func (x *DBSign) GetTips() int32 {
return 0
}
type DBRandomName struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
NameCn string `protobuf:"bytes,1,opt,name=name_cn,json=nameCn,proto3" json:"name_cn" bson:"name_cn"` //中文名
Gender int32 `protobuf:"varint,2,opt,name=gender,proto3" json:"gender"` //@go_tags(`bson:"gender"`)性别
Status int32 `protobuf:"varint,3,opt,name=status,proto3" json:"status" bson:"status"` // 0未使用1已使用
}
func (x *DBRandomName) Reset() {
*x = DBRandomName{}
if protoimpl.UnsafeEnabled {
mi := &file_user_user_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBRandomName) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBRandomName) ProtoMessage() {}
func (x *DBRandomName) ProtoReflect() protoreflect.Message {
mi := &file_user_user_db_proto_msgTypes[4]
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 DBRandomName.ProtoReflect.Descriptor instead.
func (*DBRandomName) Descriptor() ([]byte, []int) {
return file_user_user_db_proto_rawDescGZIP(), []int{4}
}
func (x *DBRandomName) GetNameCn() string {
if x != nil {
return x.NameCn
}
return ""
}
func (x *DBRandomName) GetGender() int32 {
if x != nil {
return x.Gender
}
return 0
}
func (x *DBRandomName) GetStatus() int32 {
if x != nil {
return x.Status
}
return 0
}
var File_user_user_db_proto protoreflect.FileDescriptor
var file_user_user_db_proto_rawDesc = []byte{
0x0a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01, 0x0a, 0x09, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73,
0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb5, 0x01, 0x0a, 0x09, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73,
0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
@ -726,104 +797,112 @@ var file_user_user_db_proto_rawDesc = []byte{
0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61,
0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xf4,
0x07, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 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, 0x12, 0x0a, 0x04, 0x75,
0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12,
0x18, 0x0a, 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
0x52, 0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a,
0x03, 0x73, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12,
0x1a, 0x0a, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28,
0x09, 0x52, 0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x6c,
0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09,
0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x12, 0x14, 0x0a,
0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74,
0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d,
0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61,
0x74, 0x61, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
0x72, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52,
0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x0e, 0x20, 0x01,
0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78,
0x70, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78, 0x70, 0x12,
0x1a, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x10, 0x20, 0x01, 0x28,
0x03, 0x52, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63,
0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x63, 0x72,
0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x12, 0x20, 0x01, 0x28,
0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x13, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f,
0x6e, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e,
0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69,
0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66,
0x66, 0x6c, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67,
0x75, 0x72, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72,
0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x67, 0x70, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x62, 0x67, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52,
0x02, 0x70, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76,
0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c,
0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x12,
0x1a, 0x0a, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28,
0x05, 0x52, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74,
0x61, 0x6c, 0x65, 0x6e, 0x74, 0x31, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61,
0x6c, 0x65, 0x6e, 0x74, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32,
0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x12,
0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c,
0x65, 0x6e, 0x74, 0x34, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65,
0x6e, 0x74, 0x34, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d,
0x6f, 0x6e, 0x65, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63,
0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69,
0x6e, 0x73, 0x18, 0x21, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12,
0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x22, 0x20, 0x01, 0x28, 0x09,
0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72,
0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x23, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75,
0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67,
0x18, 0x24, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x12, 0x0a,
0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x25, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x61, 0x72, 0x65,
0x61, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x26, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x76,
0x63, 0x6f, 0x64, 0x65, 0x18, 0x27, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x63, 0x6f, 0x64,
0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09,
0x52, 0x05, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76,
0x61, 0x6e, 0x4c, 0x76, 0x18, 0x29, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61,
0x76, 0x61, 0x6e, 0x4c, 0x76, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72,
0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61,
0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68,
0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04,
0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12,
0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77,
0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12,
0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18,
0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a,
0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75,
0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01,
0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e,
0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75,
0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01,
0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78,
0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69,
0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22,
0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08,
0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67,
0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18,
0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03,
0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16,
0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06,
0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08,
0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c,
0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xf4, 0x07, 0x0a,
0x06, 0x44, 0x42, 0x55, 0x73, 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, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69,
0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a,
0x07, 0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
0x62, 0x69, 0x6e, 0x64, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73,
0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x1a, 0x0a,
0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
0x08, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73,
0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
0x6c, 0x61, 0x73, 0x74, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x69, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x63,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d,
0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12,
0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61,
0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12,
0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67,
0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x03,
0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78, 0x70, 0x18,
0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78, 0x70, 0x12, 0x1a, 0x0a,
0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52,
0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61,
0x74, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52,
0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c,
0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72,
0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12,
0x10, 0x0a, 0x03, 0x62, 0x67, 0x70, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x67,
0x70, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70,
0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72,
0x50, 0x73, 0x53, 0x65, 0x63, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c, 0x61, 0x73,
0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x12, 0x1a, 0x0a,
0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52,
0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c,
0x65, 0x6e, 0x74, 0x31, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65,
0x6e, 0x74, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x18, 0x1d,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x12, 0x18, 0x0a,
0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e,
0x74, 0x34, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74,
0x34, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x6d, 0x6f, 0x6e,
0x65, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x65, 0x72, 0x63, 0x68, 0x61,
0x6e, 0x74, 0x6d, 0x6f, 0x6e, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73,
0x18, 0x21, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x18, 0x0a,
0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x22, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x75, 0x72, 0x41, 0x63,
0x74, 0x69, 0x6f, 0x6e, 0x18, 0x23, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x75, 0x72, 0x41,
0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x18, 0x24,
0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x61,
0x72, 0x65, 0x61, 0x18, 0x25, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12,
0x18, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x26, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x63, 0x6f,
0x64, 0x65, 0x18, 0x27, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x63, 0x6f, 0x64, 0x65, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
0x76, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61, 0x6e,
0x4c, 0x76, 0x18, 0x29, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x61, 0x72, 0x61, 0x76, 0x61,
0x6e, 0x4c, 0x76, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68,
0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12,
0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01,
0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a,
0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c,
0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a,
0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75,
0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20,
0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67,
0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a,
0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75,
0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12,
0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61,
0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75,
0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69,
0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xb8, 0x01,
0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69,
0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69,
0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43,
0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61,
0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06,
0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75,
0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01,
0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61,
0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65,
0x5f, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43,
0x6e, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61,
0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
@ -838,12 +917,13 @@ func file_user_user_db_proto_rawDescGZIP() []byte {
return file_user_user_db_proto_rawDescData
}
var file_user_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_user_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_user_user_db_proto_goTypes = []interface{}{
(*CacheUser)(nil), // 0: CacheUser
(*DBUser)(nil), // 1: DBUser
(*DBUserSetting)(nil), // 2: DBUserSetting
(*DBSign)(nil), // 3: DBSign
(*DBRandomName)(nil), // 4: DBRandomName
}
var file_user_user_db_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
@ -907,6 +987,18 @@ func file_user_user_db_proto_init() {
return nil
}
}
file_user_user_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBRandomName); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -914,7 +1006,7 @@ func file_user_user_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_user_user_db_proto_rawDesc,
NumEnums: 0,
NumMessages: 4,
NumMessages: 5,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -3041,6 +3041,99 @@ func (x *UserSkinlistPush) GetAvatar() string {
return ""
}
type UserRandomNameReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *UserRandomNameReq) Reset() {
*x = UserRandomNameReq{}
if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[57]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *UserRandomNameReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*UserRandomNameReq) ProtoMessage() {}
func (x *UserRandomNameReq) ProtoReflect() protoreflect.Message {
mi := &file_user_user_msg_proto_msgTypes[57]
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 UserRandomNameReq.ProtoReflect.Descriptor instead.
func (*UserRandomNameReq) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{57}
}
type UserRandomNameResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name"`
Gender int32 `protobuf:"varint,2,opt,name=gender,proto3" json:"gender"`
}
func (x *UserRandomNameResp) Reset() {
*x = UserRandomNameResp{}
if protoimpl.UnsafeEnabled {
mi := &file_user_user_msg_proto_msgTypes[58]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *UserRandomNameResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*UserRandomNameResp) ProtoMessage() {}
func (x *UserRandomNameResp) ProtoReflect() protoreflect.Message {
mi := &file_user_user_msg_proto_msgTypes[58]
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 UserRandomNameResp.ProtoReflect.Descriptor instead.
func (*UserRandomNameResp) Descriptor() ([]byte, []int) {
return file_user_user_msg_proto_rawDescGZIP(), []int{58}
}
func (x *UserRandomNameResp) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *UserRandomNameResp) GetGender() int32 {
if x != nil {
return x.Gender
}
return 0
}
var File_user_user_msg_proto protoreflect.FileDescriptor
var file_user_user_msg_proto_rawDesc = []byte{
@ -3285,8 +3378,13 @@ var file_user_user_msg_proto_rawDesc = []byte{
0x75, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x42,
0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x75, 0x72, 0x42, 0x67, 0x12, 0x16,
0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x61,
0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x22, 0x40, 0x0a, 0x12, 0x55,
0x73, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73,
0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -3301,7 +3399,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte {
return file_user_user_msg_proto_rawDescData
}
var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 57)
var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 59)
var file_user_user_msg_proto_goTypes = []interface{}{
(*UserLoginReq)(nil), // 0: UserLoginReq
(*UserLoginResp)(nil), // 1: UserLoginResp
@ -3360,41 +3458,43 @@ var file_user_user_msg_proto_goTypes = []interface{}{
(*UserSwitchDefPerReq)(nil), // 54: UserSwitchDefPerReq
(*UserSwitchDefPerResp)(nil), // 55: UserSwitchDefPerResp
(*UserSkinlistPush)(nil), // 56: UserSkinlistPush
(*DBUser)(nil), // 57: DBUser
(*DBUserExpand)(nil), // 58: DBUserExpand
(ErrorCode)(0), // 59: ErrorCode
(*CacheUser)(nil), // 60: CacheUser
(*DBUserSetting)(nil), // 61: DBUserSetting
(*DBPagodaRecord)(nil), // 62: DBPagodaRecord
(*DBHuntingRank)(nil), // 63: DBHuntingRank
(*DBVikingRank)(nil), // 64: DBVikingRank
(*DBServerData)(nil), // 65: DBServerData
(*DBSign)(nil), // 66: DBSign
(*UserAtno)(nil), // 67: UserAtno
(*UserAssets)(nil), // 68: UserAssets
(*UserRandomNameReq)(nil), // 57: UserRandomNameReq
(*UserRandomNameResp)(nil), // 58: UserRandomNameResp
(*DBUser)(nil), // 59: DBUser
(*DBUserExpand)(nil), // 60: DBUserExpand
(ErrorCode)(0), // 61: ErrorCode
(*CacheUser)(nil), // 62: CacheUser
(*DBUserSetting)(nil), // 63: DBUserSetting
(*DBPagodaRecord)(nil), // 64: DBPagodaRecord
(*DBHuntingRank)(nil), // 65: DBHuntingRank
(*DBVikingRank)(nil), // 66: DBVikingRank
(*DBServerData)(nil), // 67: DBServerData
(*DBSign)(nil), // 68: DBSign
(*UserAtno)(nil), // 69: UserAtno
(*UserAssets)(nil), // 70: UserAssets
}
var file_user_user_msg_proto_depIdxs = []int32{
57, // 0: UserLoginResp.data:type_name -> DBUser
58, // 1: UserLoginResp.ex:type_name -> DBUserExpand
57, // 2: UserInfoResp.data:type_name -> DBUser
58, // 3: UserInfoResp.ex:type_name -> DBUserExpand
59, // 4: UserRegisterResp.Code:type_name -> ErrorCode
60, // 5: UserLoadResp.data:type_name -> CacheUser
61, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
61, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
59, // 8: UserModifynameResp.code:type_name -> ErrorCode
57, // 9: UserBattlerecordResp.data:type_name -> DBUser
58, // 10: UserBattlerecordResp.ex:type_name -> DBUserExpand
62, // 11: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
63, // 12: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
64, // 13: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
60, // 14: UserOnlineResp.users:type_name -> CacheUser
57, // 15: UserDataListResp.users:type_name -> DBUser
65, // 16: UserGetServerDataResp.data:type_name -> DBServerData
66, // 17: UserSignResp.data:type_name -> DBSign
66, // 18: UserChangeTipsResp.data:type_name -> DBSign
67, // 19: UserSellResReq.atno:type_name -> UserAtno
68, // 20: UserSellResResp.atn:type_name -> UserAssets
59, // 0: UserLoginResp.data:type_name -> DBUser
60, // 1: UserLoginResp.ex:type_name -> DBUserExpand
59, // 2: UserInfoResp.data:type_name -> DBUser
60, // 3: UserInfoResp.ex:type_name -> DBUserExpand
61, // 4: UserRegisterResp.Code:type_name -> ErrorCode
62, // 5: UserLoadResp.data:type_name -> CacheUser
63, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting
63, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting
61, // 8: UserModifynameResp.code:type_name -> ErrorCode
59, // 9: UserBattlerecordResp.data:type_name -> DBUser
60, // 10: UserBattlerecordResp.ex:type_name -> DBUserExpand
64, // 11: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord
65, // 12: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank
66, // 13: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank
62, // 14: UserOnlineResp.users:type_name -> CacheUser
59, // 15: UserDataListResp.users:type_name -> DBUser
67, // 16: UserGetServerDataResp.data:type_name -> DBServerData
68, // 17: UserSignResp.data:type_name -> DBSign
68, // 18: UserChangeTipsResp.data:type_name -> DBSign
69, // 19: UserSellResReq.atno:type_name -> UserAtno
70, // 20: UserSellResResp.atn:type_name -> UserAssets
21, // [21:21] is the sub-list for method output_type
21, // [21:21] is the sub-list for method input_type
21, // [21:21] is the sub-list for extension type_name
@ -4100,6 +4200,30 @@ func file_user_user_msg_proto_init() {
return nil
}
}
file_user_user_msg_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserRandomNameReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_user_user_msg_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserRandomNameResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -4107,7 +4231,7 @@ func file_user_user_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_user_user_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 57,
NumMessages: 59,
NumExtensions: 0,
NumServices: 0,
},

View File

@ -18,6 +18,7 @@ type GameBattleReadyData struct {
BattleScenes []string
DisableAiCamera int32
DefaultHero int32
ChoseHero []string
DisableHero []string
LockSlots []int32
AssistTeam int32
@ -52,6 +53,20 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["ChoseHero"].([]interface{}); !_ok_ { err = errors.New("ChoseHero error"); return }
_v.ChoseHero = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.ChoseHero = append(_v.ChoseHero, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool

View File

@ -47,7 +47,7 @@ func (_v *GameRobotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["robotid"].(float64); !_ok_ { err = errors.New("robotid error"); return }; _v.Robotid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvshow"].(float64); !_ok_ { err = errors.New("lvshow error"); return }; _v.Lvshow = int32(_tempNum_) }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero1"].(float64); !_ok_ { err = errors.New("hero1 error"); return }; _v.Hero1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv1"].(float64); !_ok_ { err = errors.New("lv1 error"); return }; _v.Lv1 = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star1"].(float64); !_ok_ { err = errors.New("star1 error"); return }; _v.Star1 = int32(_tempNum_) }

View File

@ -114,6 +114,7 @@ type GameGlobalData struct {
ArenaTicketMax int32
ArenaTicketRecoveryTime int32
ArenaTicketCos *Gameatn
ArenaBuy []*Gameatn
VikingExpeditionRecoveryTime int32
CopsRecoveryTime int32
CopsInitialNum int32
@ -492,6 +493,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_max"].(float64); !_ok_ { err = errors.New("ArenaTicket_max error"); return }; _v.ArenaTicketMax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ArenaTicket_RecoveryTime"].(float64); !_ok_ { err = errors.New("ArenaTicket_RecoveryTime error"); return }; _v.ArenaTicketRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["ArenaTicket_cos"].(map[string]interface{}); !_ok_ { err = errors.New("ArenaTicket_cos error"); return }; if _v.ArenaTicketCos, err = DeserializeGameatn(_x_); err != nil { return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["Arena_buy"].([]interface{}); !_ok_ { err = errors.New("Arena_buy error"); return }
_v.ArenaBuy = 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.ArenaBuy = append(_v.ArenaBuy, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["VikingExpedition_RecoveryTime"].(float64); !_ok_ { err = errors.New("VikingExpedition_RecoveryTime error"); return }; _v.VikingExpeditionRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_RecoveryTime"].(float64); !_ok_ { err = errors.New("cops_RecoveryTime error"); return }; _v.CopsRecoveryTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cops_InitialNum"].(float64); !_ok_ { err = errors.New("cops_InitialNum error"); return }; _v.CopsInitialNum = int32(_tempNum_) }