This commit is contained in:
meixiongfeng 2024-01-30 14:43:22 +08:00
commit b5e2f1313f
16 changed files with 9096 additions and 4904 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1498,7 +1498,6 @@
"id": 256,
"insert": 1,
"filter": [
"eq",
"gte"
]
},
@ -1506,22 +1505,20 @@
"id": 257,
"insert": 2,
"filter": [
"gte"
"eq"
]
},
{
"id": 258,
"insert": 2,
"filter": [
"eq",
"gte"
"eq"
]
},
{
"id": 259,
"insert": 3,
"filter": [
"eq",
"eq"
]
}

View File

@ -23,7 +23,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000001,
"yihuagroup": 0
},
{
@ -50,7 +50,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000002,
"yihuagroup": 0
},
{
@ -77,7 +77,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000003,
"yihuagroup": 0
},
{
@ -104,7 +104,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000004,
"yihuagroup": 0
},
{
@ -131,7 +131,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000005,
"yihuagroup": 0
},
{
@ -158,7 +158,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000006,
"yihuagroup": 0
},
{
@ -185,7 +185,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000007,
"yihuagroup": 0
},
{
@ -212,7 +212,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000008,
"yihuagroup": 0
},
{
@ -239,7 +239,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000009,
"yihuagroup": 0
},
{
@ -266,7 +266,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000010,
"yihuagroup": 0
},
{
@ -293,7 +293,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000011,
"yihuagroup": 0
},
{
@ -320,7 +320,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000012,
"yihuagroup": 101
},
{
@ -347,7 +347,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000013,
"yihuagroup": 102
},
{
@ -374,7 +374,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000014,
"yihuagroup": 103
},
{
@ -401,7 +401,7 @@
"n": 200
}
],
"taskid": 0,
"taskid": 23000015,
"yihuagroup": 104
}
]

View File

@ -1,16 +1,16 @@
[
{
"id": 1001,
"id": 23100001,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_01",
"text": "消耗3000钻石"
"text": "噩梦侵袭累计进行1场战斗"
},
"TaskId": 17100001,
"TaskId": 23100001,
"iType": 1,
"jumpto": 150,
"skillid": [
933005433,
823011423
823011423,
933005431
],
"des": {
"key": "IntegralBoss_Integralcondition_des_01",
@ -18,17 +18,17 @@
}
},
{
"id": 1002,
"id": 23100002,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_02",
"text": "进行30次召唤"
"text": "噩梦侵袭累计进行6场战斗"
},
"TaskId": 17100002,
"TaskId": 23100002,
"iType": 1,
"jumpto": 150,
"skillid": [
843004421,
923011432
923011432,
933005432
],
"des": {
"key": "IntegralBoss_Integralcondition_des_02",
@ -36,17 +36,17 @@
}
},
{
"id": 1003,
"id": 23100003,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_03",
"text": "赠送10次友情点"
"text": "噩梦侵袭累计进行12场战斗"
},
"TaskId": 17100003,
"TaskId": 23100003,
"iType": 1,
"jumpto": 150,
"skillid": [
843004422,
923011433
923011433,
933005433
],
"des": {
"key": "IntegralBoss_Integralcondition_des_03",
@ -54,17 +54,17 @@
}
},
{
"id": 1004,
"id": 23100004,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_04",
"text": "竞技场挑战10次"
"text": "累计登录1天"
},
"TaskId": 17100004,
"TaskId": 23100004,
"iType": 1,
"jumpto": 150,
"skillid": [
943004431,
835003422
835003422,
843004421
],
"des": {
"key": "IntegralBoss_Integralcondition_des_04",
@ -72,16 +72,17 @@
}
},
{
"id": 1005,
"id": 23100005,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_05",
"text": "在商店购物3次"
"text": "累计登录2天"
},
"TaskId": 17100005,
"TaskId": 23100005,
"iType": 1,
"jumpto": 150,
"skillid": [
835003423
835003423,
843004422
],
"des": {
"key": "IntegralBoss_Integralcondition_des_05",
@ -89,16 +90,17 @@
}
},
{
"id": 1006,
"id": 23100006,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_06",
"text": "完成5次俱乐部任务"
"text": "累计登录3天"
},
"TaskId": 17100006,
"TaskId": 23100006,
"iType": 1,
"jumpto": 150,
"skillid": [
935003432
935003432,
943004431
],
"des": {
"key": "IntegralBoss_Integralcondition_des_06",
@ -106,12 +108,12 @@
}
},
{
"id": 1007,
"id": 23100007,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_07",
"text": "拍照1次"
"text": "累计登录4天"
},
"TaskId": 17100007,
"TaskId": 23100007,
"iType": 1,
"jumpto": 150,
"skillid": [
@ -123,12 +125,12 @@
}
},
{
"id": 1008,
"id": 23100008,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_08",
"text": "制作食物1次"
"text": "累计登录5天"
},
"TaskId": 17100008,
"TaskId": 23100008,
"iType": 1,
"jumpto": 150,
"skillid": [
@ -138,39 +140,5 @@
"key": "IntegralBoss_Integralcondition_des_08",
"text": "[敌方]所有减益效果持续回合数+1"
}
},
{
"id": 1009,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_09",
"text": "修炼塔挑战3次"
},
"TaskId": 17100009,
"iType": 1,
"jumpto": 150,
"skillid": [
933005431
],
"des": {
"key": "IntegralBoss_Integralcondition_des_09",
"text": "[敌方]受到持续伤害增加50%"
}
},
{
"id": 1010,
"condition": {
"key": "IntegralBoss_Integralcondition_condition_10",
"text": "任意守护者升级1次"
},
"TaskId": 17100010,
"iType": 1,
"jumpto": 150,
"skillid": [
933005432
],
"des": {
"key": "IntegralBoss_Integralcondition_des_10",
"text": "[敌方]无法触发会心"
}
}
]

File diff suppressed because it is too large Load Diff

View File

@ -67,7 +67,7 @@
],
"name": {
"key": "mainchapter_main_chapter_name_13",
"text": "希卡普的故事"
"text": "酋长的蜕变"
},
"worldname": {
"key": "mainchapter_main_chapter_worldname_1",

View File

@ -41106,7 +41106,8 @@
},
"venturetype": 2,
"ventureavatar": [
"sbkp_js_35002"
"sbkp_js_35002",
"sbkp_js_14003"
],
"scene_effect": [
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",

View File

@ -7567,12 +7567,12 @@
"presondraw": "",
"height": 30,
"weight": 1,
"ico": "tx_js_85001",
"ico": "tx_js_55005",
"fight": "tx_js_55005",
"img": "sbkp_js_85001",
"heroimg": "hbkp_js_85001",
"portrait": "zm_img_85001",
"bust": "bust_85001",
"img": "sbkp_js_55005",
"heroimg": "hbkp_js_55005",
"portrait": "zm_img_55005",
"bust": "bust_55005",
"postxyz": [
0,
0,
@ -7602,12 +7602,12 @@
"presondraw": "",
"height": 30,
"weight": 1,
"ico": "tx_js_85002",
"ico": "tx_js_55006",
"fight": "tx_js_55006",
"img": "sbkp_js_85002",
"heroimg": "hbkp_js_85002",
"portrait": "zm_img_85002",
"bust": "bust_85002",
"img": "sbkp_js_55006",
"heroimg": "hbkp_js_55006",
"portrait": "zm_img_55006",
"bust": "bust_55006",
"postxyz": [
0,
0,
@ -7637,12 +7637,12 @@
"presondraw": "",
"height": 30,
"weight": 1,
"ico": "tx_js_85003",
"ico": "tx_js_55007",
"fight": "tx_js_55007",
"img": "sbkp_js_85003",
"heroimg": "hbkp_js_85003",
"portrait": "zm_img_85003",
"bust": "bust_85003",
"img": "sbkp_js_55007",
"heroimg": "hbkp_js_55007",
"portrait": "zm_img_55007",
"bust": "bust_55007",
"postxyz": [
0,
0,

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
1
101
],
"pointweight": [
10000
@ -15,7 +15,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
2
102
],
"pointweight": [
10000
@ -26,7 +26,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
3
103
],
"pointweight": [
10000
@ -37,7 +37,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
4
104
],
"pointweight": [
10000
@ -48,7 +48,62 @@
"tasktype": 1,
"pointnum": 1,
"point": [
5
105
],
"pointweight": [
10000
]
},
{
"taskid": 100430,
"tasktype": 1,
"pointnum": 1,
"point": [
113
],
"pointweight": [
10000
]
},
{
"taskid": 100440,
"tasktype": 1,
"pointnum": 1,
"point": [
114
],
"pointweight": [
10000
]
},
{
"taskid": 100450,
"tasktype": 1,
"pointnum": 1,
"point": [
115
],
"pointweight": [
10000
]
},
{
"taskid": 100460,
"tasktype": 1,
"pointnum": 1,
"point": [
116
],
"pointweight": [
10000
]
},
{
"taskid": 100470,
"tasktype": 1,
"pointnum": 1,
"point": [
117
],
"pointweight": [
10000
@ -59,7 +114,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
6
201
],
"pointweight": [
10000
@ -70,7 +125,7 @@
"tasktype": 1,
"pointnum": 1,
"point": [
15
202
],
"pointweight": [
10000

View File

@ -1,6 +1,6 @@
[
{
"id": 1,
"id": 101,
"type": 1,
"name": [
"GameMain",
@ -10,7 +10,7 @@
"pointweight": 1000
},
{
"id": 2,
"id": 102,
"type": 1,
"name": [
"GameMain",
@ -20,7 +20,7 @@
"pointweight": 1000
},
{
"id": 3,
"id": 103,
"type": 1,
"name": [
"GameMain",
@ -30,7 +30,7 @@
"pointweight": 1000
},
{
"id": 4,
"id": 104,
"type": 1,
"name": [
"GameMain",
@ -40,7 +40,7 @@
"pointweight": 1000
},
{
"id": 5,
"id": 105,
"type": 1,
"name": [
"GameMain",
@ -50,17 +50,7 @@
"pointweight": 1000
},
{
"id": 6,
"type": 1,
"name": [
"GameMain",
"位置6"
],
"drown": 18010000,
"pointweight": 1000
},
{
"id": 7,
"id": 106,
"type": 1,
"name": [
"GameMain",
@ -70,7 +60,7 @@
"pointweight": 1000
},
{
"id": 8,
"id": 107,
"type": 1,
"name": [
"GameMain",
@ -80,7 +70,7 @@
"pointweight": 1000
},
{
"id": 9,
"id": 108,
"type": 1,
"name": [
"GameMain",
@ -90,17 +80,7 @@
"pointweight": 1000
},
{
"id": 10,
"type": 1,
"name": [
"GameMain",
"位置10"
],
"drown": 18010000,
"pointweight": 1000
},
{
"id": 11,
"id": 109,
"type": 1,
"name": [
"GameMain",
@ -110,7 +90,7 @@
"pointweight": 1000
},
{
"id": 12,
"id": 110,
"type": 1,
"name": [
"GameMain",
@ -120,7 +100,7 @@
"pointweight": 1000
},
{
"id": 13,
"id": 111,
"type": 1,
"name": [
"GameMain",
@ -130,7 +110,7 @@
"pointweight": 1000
},
{
"id": 14,
"id": 112,
"type": 1,
"name": [
"GameMain",
@ -140,13 +120,73 @@
"pointweight": 1000
},
{
"id": 15,
"type": 2,
"id": 113,
"type": 1,
"name": [
"MainLineScene",
"100101111"
"GameMain",
"位置1"
],
"drown": 0,
"pointweight": 0
"drown": 18001025,
"pointweight": 1000
},
{
"id": 114,
"type": 1,
"name": [
"GameMain",
"位置2"
],
"drown": 18001026,
"pointweight": 1000
},
{
"id": 115,
"type": 1,
"name": [
"GameMain",
"位置3"
],
"drown": 18001027,
"pointweight": 1000
},
{
"id": 116,
"type": 1,
"name": [
"GameMain",
"位置4"
],
"drown": 18001028,
"pointweight": 1000
},
{
"id": 117,
"type": 1,
"name": [
"GameMain",
"位置5"
],
"drown": 18001029,
"pointweight": 1000
},
{
"id": 201,
"type": 1,
"name": [
"GameMain",
"位置6"
],
"drown": 18010000,
"pointweight": 1000
},
{
"id": 202,
"type": 1,
"name": [
"GameMain",
"位置10"
],
"drown": 18010000,
"pointweight": 1000
}
]

View File

@ -171,7 +171,7 @@
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_08",
"text": "尝试买一个乳猪"
"text": "购买烟熏三文鱼"
},
"chosetype": 2,
"chosenum": 0,
@ -196,7 +196,7 @@
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_09",
"text": "尝试买一个乳猪"
"text": "购买蜜汁烤鸡"
},
"chosetype": 2,
"chosenum": 0,
@ -221,7 +221,7 @@
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_10",
"text": "尝试买一个乳猪"
"text": "购买蜂蜜蛋糕"
},
"chosetype": 2,
"chosenum": 0,
@ -246,7 +246,7 @@
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_11",
"text": "尝试买一个乳猪"
"text": "购买炸酱面"
},
"chosetype": 2,
"chosenum": 0,
@ -271,7 +271,7 @@
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_12",
"text": "尝试买一个乳猪"
"text": "购买烤乳猪"
},
"chosetype": 2,
"chosenum": 0,
@ -284,5 +284,130 @@
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 13,
"taskstarID": 100630,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_13",
"text": "购买蜜饯浇汁烤鱼"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 7000491,
"constory": 7000492,
"get": [
1006
],
"aginstory": 0,
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 14,
"taskstarID": 100640,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_14",
"text": "购买烤猪肘"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 7000511,
"constory": 7000512,
"get": [
1007
],
"aginstory": 0,
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 15,
"taskstarID": 100650,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_15",
"text": "购买番茄罗宋汤"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 7000531,
"constory": 7000532,
"get": [
1008
],
"aginstory": 0,
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 16,
"taskstarID": 100660,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_16",
"text": "购买苹果派"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 7000551,
"constory": 7000552,
"get": [
1009
],
"aginstory": 0,
"lose": [],
"jump": 0,
"num": 0
},
{
"key": 17,
"taskstarID": 100670,
"lv": 1,
"taskendID": 20090,
"npc": [
"GameMain",
"功能入口-烹饪"
],
"chosetxt": {
"key": "trendchose_trendchose_all_chosetxt_17",
"text": "购买萝卜葛缕子汤"
},
"chosetype": 2,
"chosenum": 0,
"startstory": 7000571,
"constory": 7000572,
"get": [
1010
],
"aginstory": 0,
"lose": [],
"jump": 0,
"num": 0
}
]

View File

@ -476,7 +476,7 @@
{
"id": 502,
"FormatList": [
700011
101021
],
"BattleReadyID": 126,
"EventList": [],
@ -584,5 +584,69 @@
"carexe": 500,
"reward": 0,
"exreward": []
},
{
"id": 801,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 5
},
"carexe": 500,
"reward": 0,
"exreward": []
},
{
"id": 802,
"FormatList": [
101021
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 5
},
"carexe": 500,
"reward": 0,
"exreward": []
},
{
"id": 803,
"FormatList": [
700011
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 5
},
"carexe": 500,
"reward": 0,
"exreward": []
},
{
"id": 804,
"FormatList": [
700038
],
"BattleReadyID": 126,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 5
},
"carexe": 500,
"reward": 0,
"exreward": []
}
]

View File

@ -88,5 +88,95 @@
}
],
"buy": 1
},
{
"id": 1006,
"item": [
{
"a": "item",
"t": "14020041",
"n": 1
}
],
"money": [
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"buy": 1
},
{
"id": 1007,
"item": [
{
"a": "item",
"t": "14020045",
"n": 1
}
],
"money": [
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"buy": 1
},
{
"id": 1008,
"item": [
{
"a": "item",
"t": "14020044",
"n": 1
}
],
"money": [
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"buy": 1
},
{
"id": 1009,
"item": [
{
"a": "item",
"t": "14020031",
"n": 1
}
],
"money": [
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"buy": 1
},
{
"id": 1010,
"item": [
{
"a": "item",
"t": "14020036",
"n": 1
}
],
"money": [
{
"a": "attr",
"t": "gold",
"n": 100000
}
],
"buy": 1
}
]

View File

@ -180,5 +180,57 @@
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 15,
"group": 1004,
"eventname": {
"key": "eventname_17",
"text": "炸药碎片"
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 16,
"group": 1005,
"eventname": {
"key": "eventname_18",
"text": "残余的臭屁"
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 17,
"group": 1006,
"eventname": {
"key": "eventname_19",
"text": "熊猫的脚印"
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
},
{
"id": 18,
"group": 1007,
"eventname": {
"key": "eventname_20",
"text": "残余的冰魔法"
},
"eventweight": 10000,
"eventtype": 2,
"battleready": 126,
"battleid": 101011,
"getitem": []
}
]

File diff suppressed because it is too large Load Diff