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

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

Browse Source
This commit is contained in:
liwei1dao 2023-08-14 14:02:48 +08:00
commit b73f6dc807
16 changed files with 489 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/json/game_buriedcondi.json
View File

@ -20528,7 +20528,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_723", "key": "buried_buried_condi_tasktxt_723",
"text": "击退豺狼小怪" "text": "击退恐惧灵小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -20615,7 +20615,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_726", "key": "buried_buried_condi_tasktxt_726",
"text": "击败豺狼小怪" "text": "击败恐惧灵小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -21101,7 +21101,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_743", "key": "buried_buried_condi_tasktxt_743",
"text": "击退豺狼小怪" "text": "击退恐惧灵小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -21825,7 +21825,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_768", "key": "buried_buried_condi_tasktxt_768",
"text": "击退豺狼小怪" "text": "击退恐惧灵小怪"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -21883,7 +21883,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_770", "key": "buried_buried_condi_tasktxt_770",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22175,7 +22175,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_780", "key": "buried_buried_condi_tasktxt_780",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22204,7 +22204,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_781", "key": "buried_buried_condi_tasktxt_781",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22233,7 +22233,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_782", "key": "buried_buried_condi_tasktxt_782",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22348,7 +22348,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_786", "key": "buried_buried_condi_tasktxt_786",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22377,7 +22377,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_787", "key": "buried_buried_condi_tasktxt_787",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22608,7 +22608,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_795", "key": "buried_buried_condi_tasktxt_795",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,
@ -22637,7 +22637,7 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_796", "key": "buried_buried_condi_tasktxt_796",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"type": 70, "type": 70,
"valid": 0, "valid": 0,

18
bin/json/game_heroupstorychapter.json
View File

@ -12,7 +12,7 @@
"level": 101, "level": 101,
"levellink": [], "levellink": [],
"leveltype": 1, "leveltype": 1,
"startstory": 10254, "startstory": 20325,
"battle": 0, "battle": 0,
"reward": [ "reward": [
{ {
@ -45,7 +45,7 @@
1 1
], ],
"leveltype": 2, "leveltype": 2,
"startstory": 10254, "startstory": 20325,
"battle": 101, "battle": 101,
"reward": [ "reward": [
{ {
@ -139,7 +139,7 @@
4 4
], ],
"leveltype": 5, "leveltype": 5,
"startstory": 10254, "startstory": 20325,
"battle": 101, "battle": 101,
"reward": [ "reward": [
{ {
@ -170,7 +170,7 @@
"level": 101, "level": 101,
"levellink": [], "levellink": [],
"leveltype": 1, "leveltype": 1,
"startstory": 10254, "startstory": 20325,
"battle": 0, "battle": 0,
"reward": [ "reward": [
{ {
@ -203,7 +203,7 @@
1 1
], ],
"leveltype": 2, "leveltype": 2,
"startstory": 10254, "startstory": 20325,
"battle": 101, "battle": 101,
"reward": [ "reward": [
{ {
@ -297,7 +297,7 @@
4 4
], ],
"leveltype": 5, "leveltype": 5,
"startstory": 10254, "startstory": 20325,
"battle": 0, "battle": 0,
"reward": [ "reward": [
{ {
@ -328,7 +328,7 @@
"level": 101, "level": 101,
"levellink": [], "levellink": [],
"leveltype": 1, "leveltype": 1,
"startstory": 10254, "startstory": 20325,
"battle": 0, "battle": 0,
"reward": [ "reward": [
{ {
@ -361,7 +361,7 @@
1 1
], ],
"leveltype": 2, "leveltype": 2,
"startstory": 10254, "startstory": 20325,
"battle": 101, "battle": 101,
"reward": [ "reward": [
{ {
@ -455,7 +455,7 @@
4 4
], ],
"leveltype": 5, "leveltype": 5,
"startstory": 10254, "startstory": 20325,
"battle": 0, "battle": 0,
"reward": [ "reward": [
{ {

147
bin/json/game_item.json
View File

@ -18397,7 +18397,7 @@
"text": "可用于拼图游戏中完成拼图游戏" "text": "可用于拼图游戏中完成拼图游戏"
}, },
"describe": { "describe": {
"key": "", "key": "item_item_describe_395",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18442,7 +18442,7 @@
"text": "可用于云上行走游戏中" "text": "可用于云上行走游戏中"
}, },
"describe": { "describe": {
"key": "", "key": "item_item_describe_396",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18487,7 +18487,7 @@
"text": "可用于黄金矿工游戏中" "text": "可用于黄金矿工游戏中"
}, },
"describe": { "describe": {
"key": "", "key": "item_item_describe_397",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18532,7 +18532,7 @@
"text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。" "text": "鹦鹉螺较为罕见，又因其外形精巧美丽，因此成为稀缺货币的代名词。人们即使历经磨难也只能得到很少的鹦鹉螺，收到它作为奖励是一件非常自豪骄傲的事。"
}, },
"describe": { "describe": {
"key": "item_item_describe_395", "key": "item_item_describe_398",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18577,7 +18577,7 @@
"text": "可以从中自由选择3种属性招募卷的宝箱" "text": "可以从中自由选择3种属性招募卷的宝箱"
}, },
"describe": { "describe": {
"key": "item_item_describe_396", "key": "item_item_describe_399",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18624,7 +18624,7 @@
"text": "开启后，可以获得一套4星装备。" "text": "开启后，可以获得一套4星装备。"
}, },
"describe": { "describe": {
"key": "item_item_describe_397", "key": "item_item_describe_400",
"text": "" "text": ""
}, },
"dialogue": { "dialogue": {
@ -18638,5 +18638,140 @@
"n": 1000 "n": 1000
} }
] ]
},
{
"id": "24010001",
"name": {
"key": "item_item_name_392",
"text": "鳄犬的尾巴"
},
"usetype": 1,
"color": 2,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_24010001",
"intr": {
"key": "item_item_intr_401",
"text": ""
},
"describe": {
"key": "item_item_describe_401",
"text": ""
},
"dialogue": {
"key": "item_item_dialogue_399",
"text": ""
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
},
{
"id": "24010002",
"name": {
"key": "item_item_name_393",
"text": "猫头熊的皮毛"
},
"usetype": 1,
"color": 2,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_24010002",
"intr": {
"key": "item_item_intr_402",
"text": ""
},
"describe": {
"key": "item_item_describe_402",
"text": ""
},
"dialogue": {
"key": "item_item_dialogue_400",
"text": ""
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
},
{
"id": "24010003",
"name": {
"key": "item_item_name_394",
"text": "猛犸象牙"
},
"usetype": 1,
"color": 2,
"bagtype": 1,
"index": 1,
"special_type": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_24010003",
"intr": {
"key": "item_item_intr_403",
"text": ""
},
"describe": {
"key": "item_item_describe_403",
"text": ""
},
"dialogue": {
"key": "item_item_dialogue_401",
"text": ""
},
"sale": [
{
"a": "attr",
"t": "gold",
"n": 1000
}
]
} }
] ]

42
bin/json/game_mainstage.json
View File

@ -735,9 +735,9 @@
"ps_mg": [], "ps_mg": [],
"firstaward": [ "firstaward": [
{ {
"a": "attr", "a": "item",
"t": "gold", "t": "24010001",
"n": 6000 "n": 1
} }
], ],
"lotteryward": 0, "lotteryward": 0,
@ -799,9 +799,9 @@
"ps_mg": [], "ps_mg": [],
"firstaward": [ "firstaward": [
{ {
"a": "attr", "a": "item",
"t": "gold", "t": "24010002",
"n": 6001 "n": 1
} }
], ],
"lotteryward": 0, "lotteryward": 0,
@ -863,9 +863,9 @@
"ps_mg": [], "ps_mg": [],
"firstaward": [ "firstaward": [
{ {
"a": "attr", "a": "item",
"t": "gold", "t": "24010003",
"n": 6002 "n": 1
} }
], ],
"lotteryward": 0, "lotteryward": 0,
@ -6855,7 +6855,7 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 0, "progress": 0,
"frontstoryid": 0, "frontstoryid": 20100,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -7021,7 +7021,7 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20106, "frontstoryid": 20105,
"afterstoryid": 20107, "afterstoryid": 20107,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -7657,8 +7657,8 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20122, "frontstoryid": 20115,
"afterstoryid": 20125, "afterstoryid": 20117,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -7763,8 +7763,8 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20200, "frontstoryid": 20218,
"afterstoryid": 20201, "afterstoryid": 20219,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -7869,8 +7869,8 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20204, "frontstoryid": 0,
"afterstoryid": 20206, "afterstoryid": 20222,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -7975,8 +7975,8 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20207, "frontstoryid": 20225,
"afterstoryid": 20209, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""
@ -8081,8 +8081,8 @@
"hide": 0, "hide": 0,
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"frontstoryid": 20210, "frontstoryid": 20226,
"afterstoryid": 20211, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
"text": "" "text": ""

12
bin/json/game_monsterformat.json
View File

@ -325,7 +325,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -345,7 +345,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -625,7 +625,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -645,7 +645,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -665,7 +665,7 @@
"captainId": 1, "captainId": 1,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],
@ -685,7 +685,7 @@
"captainId": 0, "captainId": 0,
"IsBoss": 0, "IsBoss": 0,
"bossHpCnt": 0, "bossHpCnt": 0,
"heroid": 51004, "heroid": 51012,
"star": 3, "star": 3,
"equip": [], "equip": [],
"newskill": [], "newskill": [],

71
bin/json/game_opencond.json
View File

@ -96,10 +96,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100101
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -246,10 +242,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100101
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -273,10 +265,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100101
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -323,10 +311,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100101
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -396,10 +380,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100404
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -652,10 +632,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100608
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -702,10 +678,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100404
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -889,10 +861,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100304
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -916,10 +884,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100508
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1288,10 +1252,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100408
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1536,12 +1496,7 @@
"key": "opencond_opencond_name_66", "key": "opencond_opencond_name_66",
"text": "炼金塔" "text": "炼金塔"
}, },
"main": [ "main": [],
{
"key": 2,
"param": 1100308
}
],
"wkqbx": 1, "wkqbx": 1,
"kqbx": 0, "kqbx": 0,
"img": "", "img": "",
@ -1738,10 +1693,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100808
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1788,10 +1739,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100604
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1842,10 +1789,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100504
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1941,10 +1884,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1101208
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1986,10 +1925,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1101008
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -2013,10 +1948,6 @@
{ {
"key": 1, "key": 1,
"param": 1 "param": 1
},
{
"key": 2,
"param": 1100408
} }
], ],
"wkqbx": 2, "wkqbx": 2,

80
bin/json/game_stoneevent.json
View File

@ -11,7 +11,13 @@
"Value2": 0, "Value2": 0,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -27,7 +33,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -43,7 +55,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -59,7 +77,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -75,7 +99,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -91,7 +121,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -107,7 +143,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -123,7 +165,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -139,7 +187,13 @@
"Value2": 2, "Value2": 2,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },
@ -155,7 +209,13 @@
"Value2": 1, "Value2": 1,
"Value3": 0, "Value3": 0,
"Value4": 0, "Value4": 0,
"CostItem": [], "CostItem": [
{
"a": "item",
"t": "10000039",
"n": 1
}
],
"PostEvent": 0, "PostEvent": 0,
"probability": 0 "probability": 0
}, },

6
bin/json/game_stoneroom.json
View File

@ -32,7 +32,7 @@
"EventStoreGroup": 0, "EventStoreGroup": 0,
"BossEvent": 0, "BossEvent": 0,
"Condition": [ "Condition": [
16 14
] ]
}, },
{ {
@ -50,7 +50,7 @@
"EventStoreGroup": 0, "EventStoreGroup": 0,
"BossEvent": 0, "BossEvent": 0,
"Condition": [ "Condition": [
16 14
] ]
}, },
{ {
@ -86,7 +86,7 @@
"EventStoreGroup": 0, "EventStoreGroup": 0,
"BossEvent": 0, "BossEvent": 0,
"Condition": [ "Condition": [
16 14
] ]
}, },
{ {

60
bin/json/game_worldtask.json
View File

@ -147,11 +147,11 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_4", "key": "worldtask_world_task_task_details_4",
"text": "刚踏出飞船就遇到了潜入船舱甲板的豺狼小怪，尝试击败他们！" "text": "刚踏出飞船就遇到了潜入船舱甲板的恐惧灵小怪，尝试击败他们！"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_4", "key": "worldtask_world_task_npctxt_4",
"text": "击退豺狼小怪" "text": "击退恐惧灵小怪"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -279,11 +279,11 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_7", "key": "worldtask_world_task_task_details_7",
"text": "正当阿宝和邦尼兔斗嘴时，圣桃树旁出现一团黑气，随后豺狼小怪再次出现。" "text": "正当阿宝和邦尼兔斗嘴时，圣桃树旁出现一团黑气，随后恐惧灵小怪再次出现。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_7", "key": "worldtask_world_task_npctxt_7",
"text": "击败豺狼小怪" "text": "击败恐惧灵小怪"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -370,7 +370,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_9", "key": "worldtask_world_task_task_details_9",
"text": "跟着豺狼小怪消失的方向，你们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。" "text": "跟着恐惧灵小怪消失的方向，你们一行人追踪到熊猫武馆。武馆是中轴城守护者提高战斗力、习武比试的地方。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_9", "key": "worldtask_world_task_npctxt_9",
@ -992,7 +992,7 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_22", "key": "worldtask_world_task_task_details_22",
"text": "刚召唤结束，一股黑气围绕在圣桃树旁久久不散，众人惊愕下，大量豺狼小怪出现，不断袭击中轴城的防护网。" "text": "刚召唤结束，一股黑气围绕在圣桃树旁久久不散，众人惊愕下，大量恐惧灵小怪出现，不断袭击中轴城的防护网。"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_22", "key": "worldtask_world_task_npctxt_22",
@ -2086,15 +2086,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_46", "key": "worldtask_world_task_task_name_46",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_46", "key": "worldtask_world_task_task_details_46",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_46", "key": "worldtask_world_task_npctxt_46",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -2520,15 +2520,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_56", "key": "worldtask_world_task_task_name_56",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_56", "key": "worldtask_world_task_task_details_56",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_56", "key": "worldtask_world_task_npctxt_56",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -2563,15 +2563,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_57", "key": "worldtask_world_task_task_name_57",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_57", "key": "worldtask_world_task_task_details_57",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_57", "key": "worldtask_world_task_npctxt_57",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -2606,15 +2606,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_58", "key": "worldtask_world_task_task_name_58",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_58", "key": "worldtask_world_task_task_details_58",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_58", "key": "worldtask_world_task_npctxt_58",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -2778,15 +2778,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_62", "key": "worldtask_world_task_task_name_62",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_62", "key": "worldtask_world_task_task_details_62",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_62", "key": "worldtask_world_task_npctxt_62",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -2821,15 +2821,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_63", "key": "worldtask_world_task_task_name_63",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_63", "key": "worldtask_world_task_task_details_63",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_63", "key": "worldtask_world_task_npctxt_63",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -3178,15 +3178,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_71", "key": "worldtask_world_task_task_name_71",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_71", "key": "worldtask_world_task_task_details_71",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_71", "key": "worldtask_world_task_npctxt_71",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,
@ -3221,15 +3221,15 @@
"icon": "25001", "icon": "25001",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_72", "key": "worldtask_world_task_task_name_72",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_72", "key": "worldtask_world_task_task_details_72",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_72", "key": "worldtask_world_task_npctxt_72",
"text": "击退豺狼人" "text": "击退恐惧灵"
}, },
"get_item": [], "get_item": [],
"trigger": 0, "trigger": 0,

37
modules/stonehenge/api_event.go
View File

@ -45,23 +45,27 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
} }
return return
} }
if v, ok := stone.Rooms.Eventid[req.Eventid]; !ok || v == true { // 不存在该事件 if eventConf, err = this.module.configure.GetStoneEventDataById(req.Eventid); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid), Message: err.Error(),
} }
return return
} }
_, bBox := stone.Rooms.Box[req.Eventid]
if stone.Rooms.Eventid[req.Eventid] || bBox { // 重复完成 // EventType29 特殊事件
errdata = &pb.ErrorData{ if eventConf.EventType != EventType29 && eventConf.EventType != EventType10 {
Code: pb.ErrorCode_StonehengeRepeatedReward, if stone.Rooms.Eventid[req.Eventid] { // 重复完成
Title: pb.ErrorCode_StonehengeRepeatedReward.ToString(), errdata = &pb.ErrorData{
Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid), Code: pb.ErrorCode_StonehengeRepeatedReward,
Title: pb.ErrorCode_StonehengeRepeatedReward.ToString(),
Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid),
}
return
} }
return
} }
update["stageID"] = stone.StageID update["stageID"] = stone.StageID
if roomConf, err = this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err != nil { if roomConf, err = this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -71,14 +75,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
} }
return return
} }
if eventConf, err = this.module.configure.GetStoneEventDataById(req.Eventid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if len(eventConf.CostItem) > 0 { if len(eventConf.CostItem) > 0 {
if errdata = this.module.CheckRes(session, eventConf.CostItem); errdata != nil { if errdata = this.module.CheckRes(session, eventConf.CostItem); errdata != nil {
return return
@ -169,7 +166,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
return return
} }
// 次数校验 // 次数校验
if bBox && stone.Rooms.Box[req.Eventid] < eventConf.Value2 { if stone.Rooms.Box[req.Eventid] < eventConf.Value2 {
user := this.module.ModuleUser.GetUser(session.GetUserId()) user := this.module.ModuleUser.GetUser(session.GetUserId())
// 校验消耗是否 // 校验消耗是否
// if len(eventConf.CostItem) > 0 { // if len(eventConf.CostItem) > 0 {

19
modules/stonehenge/api_gotoroom.go
View File

@ -134,6 +134,25 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
stone.Rooms.Portal = []int32{c.PortalGroup} stone.Rooms.Portal = []int32{c.PortalGroup}
} }
} }
// 判断传送门是否开启
stone.Rooms.Complete = true
for _, v := range curRoomConf.Condition {
for k, ok := range stone.Rooms.Eventid {
if !ok {
if eventConf, err := this.module.configure.GetStoneEventDataById(k); err == nil {
if eventConf.EventType == v {
stone.Rooms.Complete = false
break
}
}
}
}
if !stone.Rooms.Complete {
break
}
}
update["rooms"] = stone.Rooms update["rooms"] = stone.Rooms
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update) this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "gotoroom", &pb.StonehengeGotoRoomResp{ session.SendMsg(string(this.module.GetType()), "gotoroom", &pb.StonehengeGotoRoomResp{

14
modules/stonehenge/api_shop.go
View File

@ -57,13 +57,13 @@ func (this *apiComp) Store(session comm.IUserSession, req *pb.StonehengeStoreReq
return return
} }
// 校验 是否有这个事件 // 校验 是否有这个事件
if _, ok := stone.Rooms.Eventid[storeConf.EventId]; ok { // if _, ok := stone.Rooms.Eventid[storeConf.EventId]; ok {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_StonehengeCantBuy, // Code: pb.ErrorCode_StonehengeCantBuy,
Title: pb.ErrorCode_StonehengeCantBuy.String(), // Title: pb.ErrorCode_StonehengeCantBuy.String(),
} // }
return // return
} // }
stone.Rooms.Shop[storeConf.EventId] += 1 stone.Rooms.Shop[storeConf.EventId] += 1
stone.Rooms.Eventid[storeConf.EventId] = false stone.Rooms.Eventid[storeConf.EventId] = false

10
modules/stonehenge/api_story.go
View File

@ -52,6 +52,16 @@ func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq
if req.Cid == -1 { if req.Cid == -1 {
stone.Rooms.Story = 0 stone.Rooms.Story = 0
stone.Rooms.Eventid[req.Eventid] = true stone.Rooms.Eventid[req.Eventid] = true
this.module.modelStonehenge.EventOpenRoom(req.Eventid, stone)
update["rooms"] = stone.Rooms
this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
session.SendMsg(string(this.module.GetType()), "story", &pb.StonehengeStoryResp{
Story: stone.Rooms.Story,
NewEvent: newEvent,
Room: stone.Rooms,
})
return
} else { } else {
if conf, err = this.module.configure.GetStoneStoryConf(req.Cid); err != nil { if conf, err = this.module.configure.GetStoneStoryConf(req.Cid); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{

22
modules/stonehenge/modelStonehenge.go
View File

@ -132,5 +132,27 @@ func (this *MStonehenge) AddNewEvent(event []int32, stone *pb.DBStonehenge) {
} }
} }
} }
}
// 完成事件 开启传送门
func (this *MStonehenge) EventOpenRoom(event int32, stone *pb.DBStonehenge) {
stone.Rooms.Complete = true
if roomConf, err := this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err == nil {
for _, v := range roomConf.Condition {
for k, ok := range stone.Rooms.Eventid {
if !ok {
if eventConf, err := this.module.configure.GetStoneEventDataById(k); err == nil {
if eventConf.EventType == v {
stone.Rooms.Complete = false
break
}
}
}
}
if !stone.Rooms.Complete {
break
}
}
}
} }

253
modules/tools/comp_configure.go
View File

@ -51,9 +51,9 @@ type MCompConfigure struct {
_groupType1 map[int64][]int32 //value cid _groupType1 map[int64][]int32 //value cid
// 小组类型为2 // 小组类型为2
_groupType2 map[int64][]int32 //value cid _groupType2 map[int64][]int32 //value cid
Btype map[int32]int32 //Btype map[int32]int32
Stype map[int64]int32 // subtype Stype map[int64]int32 // subtype
SNum map[int64]int32 // 小组产出数量 SNum map[int64]int32 // 小组产出数量
_price map[int32][]*cfg.GamePricegroupData _price map[int32][]*cfg.GamePricegroupData
} }
@ -84,7 +84,7 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
this._lotteryType2 = make(map[int32][]int32, 0) this._lotteryType2 = make(map[int32][]int32, 0)
this._groupType1 = make(map[int64][]int32, 0) this._groupType1 = make(map[int64][]int32, 0)
this._groupType2 = make(map[int64][]int32, 0) this._groupType2 = make(map[int64][]int32, 0)
this.Btype = make(map[int32]int32, 0) //this.Btype = make(map[int32]int32, 0)
this.Stype = make(map[int64]int32, 0) this.Stype = make(map[int64]int32, 0)
this.SNum = make(map[int64]int32, 0) this.SNum = make(map[int64]int32, 0)
configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData) configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData)
@ -102,13 +102,21 @@ func (this *MCompConfigure) LoadGroupData() {
this._lotteryType2 = make(map[int32][]int32, 0) this._lotteryType2 = make(map[int32][]int32, 0)
this._groupType1 = make(map[int64][]int32, 0) this._groupType1 = make(map[int64][]int32, 0)
this._groupType2 = make(map[int64][]int32, 0) this._groupType2 = make(map[int64][]int32, 0)
this.Btype = make(map[int32]int32, 0) //this.Btype = make(map[int32]int32, 0)
this.Stype = make(map[int64]int32, 0) this.Stype = make(map[int64]int32, 0)
this.SNum = make(map[int64]int32, 0) this.SNum = make(map[int64]int32, 0)
var tmp1 int64
var tmp2 int64
var itype int32
for _, value := range configure.GetDataList() { for _, value := range configure.GetDataList() {
key := int64(value.Lotteryid)<<31 + int64(value.Groupid) key := int64(value.Lotteryid)<<31 + int64(value.Groupid)
// key2 := int64(value.Lotteryid)<<31 + int64(value.Type)
this._group[key] = append(this._group[key], value.Id) this._group[key] = append(this._group[key], value.Id)
if value.Type == 0 {
value.Type = itype
} else {
itype = value.Type
}
// 数据安全校验 // 数据安全校验
if value.Min > value.Max { if value.Min > value.Max {
log.Errorf("value.Min:%d > value.Max :%d ", value.Min, value.Max) log.Errorf("value.Min:%d > value.Max :%d ", value.Min, value.Max)
@ -123,20 +131,25 @@ func (this *MCompConfigure) LoadGroupData() {
log.Errorf("value.Playerlvmin:%d > value.Playerlvmax :%d ", value.Playerlvmin, value.Playerlvmax) log.Errorf("value.Playerlvmin:%d > value.Playerlvmax :%d ", value.Playerlvmin, value.Playerlvmax)
return return
} }
if _, ok := this.Btype[value.Lotteryid]; !ok {
this.Btype[value.Lotteryid] = value.Type
}
if _, ok := this.Stype[key]; !ok { if _, ok := this.Stype[key]; !ok {
this.Stype[key] = value.Subtype this.Stype[key] = value.Subtype
} }
if _, ok := this.SNum[key]; !ok { if _, ok := this.SNum[key]; !ok {
this.SNum[key] = value.Groupnum this.SNum[key] = value.Groupnum
} }
if this.Btype[value.Lotteryid] == 1 {
this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id) if value.Type == 1 || value.Type == 0 {
} else if this.Btype[value.Lotteryid] == 2 { if tmp1 != key {
this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id) this._lotteryType1[value.Lotteryid] = append(this._lotteryType1[value.Lotteryid], value.Id)
tmp1 = key
}
}
if value.Type == 2 || value.Type == 0 {
if tmp2 != key {
this._lotteryType2[value.Lotteryid] = append(this._lotteryType2[value.Lotteryid], value.Id)
tmp2 = key
}
} }
if this.Stype[key] == 1 { // 小组ID为1 if this.Stype[key] == 1 { // 小组ID为1
@ -163,138 +176,112 @@ func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32,
} }
} }
// 优先校验大组ID 的类型 // 优先校验大组ID 的类型
if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组 var (
var ( szW []int32 // 权重数组
szW []int32 // 权重数组 szID []int32 // 小组ID 数组
szID []int32 // 小组ID 数组 groupID int32
groupID int32 )
gourp map[int32]int32 // key 小组ID value 权重
)
gourp = make(map[int32]int32, 0) // 随机小组id
// 随机小组id for _, v := range this._lotteryType1[lotteryId] {
for _, v := range this._lotteryType1[lotteryId] { if _data := this.GetLotterConfById(v); _data != nil {
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)) { // 过滤等级等条件 szW = append(szW, _data.Groupwt)
if _, ok := gourp[_data.Groupid]; !ok { szID = append(szID, _data.Groupid)
gourp[_data.Groupid] = _data.Groupwt // 小组ID 权重赋值
szW = append(szW, _data.Groupwt)
szID = append(szID, _data.Groupid)
}
}
} }
} }
}
groupID = szID[comm.GetRandW(szW)] // 获得小组ID groupID = szID[comm.GetRandW(szW)] // 获得小组ID
//fmt.Printf("大组类型为1的,获得小组ID :%d，dropID：%d", groupID, lotteryId) //fmt.Printf("大组类型为1的,获得小组ID :%d，dropID：%d", groupID, lotteryId)
key := int64(lotteryId)<<31 + int64(groupID) key := int64(lotteryId)<<31 + int64(groupID)
// 小组ID 类型判断 // 小组ID 类型判断
if this.Stype[key] == 1 { // 该小组的道具为权重掉落，必定从N个道具中随机出1个道具 if this.Stype[key] == 1 { // 该小组的道具为权重掉落，必定从N个道具中随机出1个道具
for i := 0; i < int(this.SNum[key]); i++ { for i := 0; i < int(this.SNum[key]); i++ {
szW = make([]int32, 0) sztW := make([]int32, 0)
szID = make([]int32, 0) sztID := make([]int32, 0)
gourp = make(map[int32]int32, 0) for _, v := range this._groupType1[key] {
for _, v := range this._groupType1[key] {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
if _, ok := gourp[_data.Groupid]; !ok {
szW = append(szW, _data.Itemwt)
szID = append(szID, _data.Id)
}
}
}
index := comm.GetRandW(szW)
_data := this.GetLotterConfById(szID[index])
//fmt.Printf("获得最终的道具 :%d", _data.Id)
count := comm.GetRandNum(_data.Min, _data.Max)
// 随机获得的数量
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count,
})
}
return
} else if this.Stype[key] == 2 { // 该小组中的道具为概率掉落，每个道具都会随机一次是否会掉落（单位为千分比）
var wt int32
for _, v := range this._groupType2[key] {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
if _data.Itemwt != 0 { sztW = append(sztW, _data.Itemwt)
wt = _data.Itemwt sztID = append(sztID, _data.Id)
}
if wt >= comm.GetRandNum(0, 1000) { // 命中
count := comm.GetRandNum(_data.Min, _data.Max)
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count, // 小组产出数量
})
}
} }
} }
return index := comm.GetRandW(sztW)
_data := this.GetLotterConfById(sztID[index])
count := comm.GetRandNum(_data.Min, _data.Max)
// 随机获得的数量
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count,
})
} }
} else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比）
// 每个小组id 都随机取一次 } else if this.Stype[key] == 2 { // 该小组中的道具为概率掉落，每个道具都会随机一次是否会掉落（单位为千分比）
var szGroupID []int32 // 获得的权重数组 for _, v := range this._groupType2[key] {
gourp := make([]*cfg.GameLotteryData, 0) // key 小组ID value 权重 if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
for _, v := range this._lotteryType2[lotteryId] {
if _data := this.GetLotterConfById(v); _data != nil { if _data.Itemwt >= comm.GetRandNum(0, 1000) { // 命中
if (_data.Playerlvmax == 0 || (_data.Playerlvmin <= lv && lv <= _data.Playerlvmax)) && (_data.VIPmax == 0 || (_data.VIPmin <= vipLv && vipLv <= _data.VIPmax)) { // 过滤等级等条件 count := comm.GetRandNum(_data.Min, _data.Max)
gourp = append(gourp, _data) items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count, // 小组产出数量
})
} }
} }
} }
// 过滤 group
var wt int32 }
// 类型为2 可能会同时获得多个组id // 每个小组id 都随机取一次
for _, v := range gourp { szW = make([]int32, 0)
k := v.Groupid szID = make([]int32, 0)
if v.Groupwt != 0 { for _, v := range this._lotteryType2[lotteryId] {
wt = v.Groupwt 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)) { // 过滤等级等条件
szW = append(szW, _data.Groupwt)
szID = append(szID, _data.Groupid)
} }
//fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id) }
if wt >= comm.GetRandNum(0, 1000) { // 命中 }
szGroupID = append(szGroupID, k)
key := int64(lotteryId)<<31 + int64(k) // 类型为2 可能会同时获得多个组id
if this.Stype[key] == 1 { // 随机一组数据 for pos, v := range szW {
for i := 0; i < int(this.SNum[key]); i++ { key := int64(lotteryId)<<31 + int64(szID[pos])
szW := make([]int32, 0) //fmt.Printf("大组类型为2的,获得小组ID :%d,dropID:%d", k, v.Id)
szID := make([]int32, 0) if v >= comm.GetRandNum(0, 1000) { // 命中
gourp := make(map[int32]int32, 0) if this.Stype[key] == 1 { // 随机一组数据
for _, v := range this._groupType1[key] { for i := 0; i < int(this.SNum[key]); i++ {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 sztW := make([]int32, 0)
if _, ok := gourp[_data.Groupid]; !ok { sztID := make([]int32, 0)
szW = append(szW, _data.Itemwt) for _, v := range this._groupType1[key] {
szID = append(szID, _data.Id)
}
}
}
index := comm.GetRandW(szW)
_data := this.GetLotterConfById(szID[index])
//fmt.Printf("获得最终的道具 :%d", _data.Id)
count := comm.GetRandNum(_data.Min, _data.Max)
// 随机获得的数量
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count,
})
}
} else if this.Stype[key] == 2 {
var wt int32
for _, v := range this._groupType2[key] {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
if _data.Itemwt != 0 { sztW = append(sztW, _data.Itemwt)
wt = _data.Itemwt sztID = append(sztID, _data.Id)
} }
if wt >= comm.GetRandNum(1, 1000) { // 命中 }
count := comm.GetRandNum(_data.Min, _data.Max) index := comm.GetRandW(sztW)
items = append(items, &cfg.Gameatn{ _data := this.GetLotterConfById(sztID[index])
A: _data.Itemid.A, //fmt.Printf("获得最终的道具 :%d", _data.Id)
T: _data.Itemid.T, count := comm.GetRandNum(_data.Min, _data.Max)
N: _data.Itemid.N * count, // 小组产出数量 // 随机获得的数量
}) items = append(items, &cfg.Gameatn{
} A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count,
})
}
} else if this.Stype[key] == 2 {
for _, v := range this._groupType2[key] {
if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值
if _data.Itemwt >= comm.GetRandNum(1, 1000) { // 命中
count := comm.GetRandNum(_data.Min, _data.Max)
items = append(items, &cfg.Gameatn{
A: _data.Itemid.A,
T: _data.Itemid.T,
N: _data.Itemid.N * count, // 小组产出数量
})
} }
} }
} }

1
modules/user/module.go
View File

@ -546,6 +546,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
} }
change.Ps += add change.Ps += add
userEx.ConsumPs += -add userEx.ConsumPs += -add
this.ModuleUiGame.HDPSTodayConsum(session.GetUserId(), change.Ps)
} else { } else {
if change.Ps+add > ggd.PsUl { if change.Ps+add > ggd.PsUl {
change.Ps = ggd.PsUl change.Ps = ggd.PsUl