上传远征代码
This commit is contained in:
liwei1dao
parent
314ceb9f6c
commit
c11a65e4e2
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1172,7 +1172,9 @@
|
||||
{
|
||||
"id": 206,
|
||||
"insert": 2,
|
||||
"filter": []
|
||||
"filter": [
|
||||
"eq"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 207,
|
||||
|
||||
@ -536,5 +536,32 @@
|
||||
"key": "item_coin_intr2_20",
|
||||
"text": "不论曾经是谁的，现在都是我的了。"
|
||||
}
|
||||
},
|
||||
{
|
||||
"key": "plundercollege",
|
||||
"keyint": 20,
|
||||
"name": {
|
||||
"key": "item_coin_name_21",
|
||||
"text": "旗帜"
|
||||
},
|
||||
"hold": 1,
|
||||
"color": 5,
|
||||
"effects": "",
|
||||
"access": [
|
||||
158
|
||||
],
|
||||
"img": "attr_sxintegral",
|
||||
"intr": {
|
||||
"key": "item_coin_intr_21",
|
||||
"text": "巨怪商队的内用来解锁更多运输次数的道具。"
|
||||
},
|
||||
"describe": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"dialogue": {
|
||||
"key": "item_coin_intr2_21",
|
||||
"text": "这是繁荣的象征"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -17,7 +17,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_01",
|
||||
"text": "胡德的毒苹果酒吧桌游卡"
|
||||
"text": "胡德的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_01",
|
||||
@ -82,7 +82,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_02",
|
||||
"text": "匹诺曹的毒苹果酒吧桌游卡"
|
||||
"text": "匹诺曹的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_02",
|
||||
@ -147,7 +147,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_03",
|
||||
"text": "姜饼人的毒苹果酒吧桌游卡"
|
||||
"text": "姜饼人的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_03",
|
||||
@ -212,7 +212,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_04",
|
||||
"text": "法夸德勋爵的毒苹果酒吧桌游卡"
|
||||
"text": "法夸德勋爵的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_04",
|
||||
@ -283,7 +283,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_05",
|
||||
"text": "大大的毒苹果酒吧桌游卡"
|
||||
"text": "大大的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_05",
|
||||
@ -354,7 +354,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_06",
|
||||
"text": "船长的毒苹果酒吧桌游卡"
|
||||
"text": "船长的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_06",
|
||||
@ -425,7 +425,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_07",
|
||||
"text": "警长的毒苹果酒吧桌游卡"
|
||||
"text": "警长的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_07",
|
||||
@ -496,7 +496,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_08",
|
||||
"text": "阿宝的毒苹果酒吧桌游卡"
|
||||
"text": "阿宝的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_08",
|
||||
@ -567,7 +567,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_09",
|
||||
"text": "师父的毒苹果酒吧桌游卡"
|
||||
"text": "师父的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_09",
|
||||
@ -638,7 +638,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_10",
|
||||
"text": "骇客蛛的毒苹果酒吧桌游卡"
|
||||
"text": "骇客蛛的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_10",
|
||||
@ -709,7 +709,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_11",
|
||||
"text": "悍娇虎的毒苹果酒吧桌游卡"
|
||||
"text": "悍娇虎的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_11",
|
||||
@ -780,7 +780,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_12",
|
||||
"text": "盖的毒苹果酒吧桌游卡。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
"text": "盖的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_12",
|
||||
@ -851,7 +851,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_13",
|
||||
"text": "菲奥娜的毒苹果酒吧桌游卡"
|
||||
"text": "菲奥娜的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_13",
|
||||
@ -922,7 +922,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_14",
|
||||
"text": "穿靴子的猫的毒苹果酒吧桌游卡"
|
||||
"text": "穿靴子的猫的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_14",
|
||||
@ -993,7 +993,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_15",
|
||||
"text": "乌龟大师的毒苹果酒吧桌游卡"
|
||||
"text": "乌龟大师的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_15",
|
||||
@ -1064,7 +1064,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_16",
|
||||
"text": "冰霜杰克的毒苹果酒吧桌游卡"
|
||||
"text": "冰霜杰克的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_16",
|
||||
@ -1135,7 +1135,7 @@
|
||||
},
|
||||
"intr": {
|
||||
"key": "consume_consume_hero_intr_17",
|
||||
"text": "漆黑的毒苹果酒吧桌游卡"
|
||||
"text": "漆黑的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
|
||||
},
|
||||
"skillname": {
|
||||
"key": "consume_consume_hero_skillname_17",
|
||||
|
||||
457
bin/json/game_expeditionboss.json
Normal file
457
bin/json/game_expeditionboss.json
Normal file
@ -0,0 +1,457 @@
|
||||
[
|
||||
{
|
||||
"boss_id": 50000001,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_1",
|
||||
"text": "希卡普"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 1,
|
||||
"fighting": 1000,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1004,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000002,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_2",
|
||||
"text": "波比"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 2,
|
||||
"fighting": 1200,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1005,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000003,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_3",
|
||||
"text": "阿宝"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 3,
|
||||
"fighting": 1440,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1006,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000004,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_4",
|
||||
"text": "希卡普"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 4,
|
||||
"fighting": 1728,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1007,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 51
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000005,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_5",
|
||||
"text": "波比"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 5,
|
||||
"fighting": 2073,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1008,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 52
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000006,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_6",
|
||||
"text": "阿宝"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 6,
|
||||
"fighting": 2487,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1009,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 53
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000007,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_7",
|
||||
"text": "希卡普"
|
||||
},
|
||||
"boss_lv": 1,
|
||||
"serial": 7,
|
||||
"fighting": 2984,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1010,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 54
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000008,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_8",
|
||||
"text": "波比"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 1,
|
||||
"fighting": 3580,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1011,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 55
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000009,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_9",
|
||||
"text": "阿宝"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 2,
|
||||
"fighting": 4296,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1012,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 56
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000010,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_10",
|
||||
"text": "希卡普"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 3,
|
||||
"fighting": 5155,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1013,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 57
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000011,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_11",
|
||||
"text": "波比"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 4,
|
||||
"fighting": 6186,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1014,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 58
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000012,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_12",
|
||||
"text": "阿宝"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 5,
|
||||
"fighting": 7423,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1015,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 59
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
},
|
||||
{
|
||||
"boss_id": 50000013,
|
||||
"boss_name": {
|
||||
"key": "guild_guild_boss_boss_name_13",
|
||||
"text": "希卡普"
|
||||
},
|
||||
"boss_lv": 2,
|
||||
"serial": 6,
|
||||
"fighting": 8907,
|
||||
"boss_img": 11009,
|
||||
"kill_reward": 1016,
|
||||
"fail_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "guildcoin",
|
||||
"n": 60
|
||||
}
|
||||
],
|
||||
"race": [
|
||||
1,
|
||||
4
|
||||
],
|
||||
"job": [
|
||||
2,
|
||||
6
|
||||
],
|
||||
"hid": [
|
||||
"25001"
|
||||
],
|
||||
"color": [
|
||||
4,
|
||||
2
|
||||
],
|
||||
"fight": 50
|
||||
}
|
||||
]
|
||||
@ -789,7 +789,11 @@
|
||||
"guild_sign_in": 10,
|
||||
"enhanceboss_ps": 10,
|
||||
"plunder_pvp_battlereadyid": 105,
|
||||
"plunder_pvp_college_num": 400,
|
||||
"plunder_pvp_college_num": {
|
||||
"a": "attr",
|
||||
"t": "plundercollege",
|
||||
"n": 400
|
||||
},
|
||||
"plunder_pvp_college_time": 7
|
||||
}
|
||||
]
|
||||
@ -25,7 +25,7 @@
|
||||
},
|
||||
"txt": {
|
||||
"key": "consume_consume_playingmethod_txt_03",
|
||||
"text": "基础方块新增炸弹方块"
|
||||
"text": "基础方块新增炸弹方块，可以消除大片区域。"
|
||||
},
|
||||
"type": 2,
|
||||
"detail": 1,
|
||||
@ -41,7 +41,7 @@
|
||||
},
|
||||
"txt": {
|
||||
"key": "consume_consume_playingmethod_txt_04",
|
||||
"text": "基础方块新增烟火方块"
|
||||
"text": "基础方块新增烟火方块，可以消除指定方向所以方块。"
|
||||
},
|
||||
"type": 2,
|
||||
"detail": 1,
|
||||
|
||||
@ -24831,7 +24831,8 @@
|
||||
"Id": [
|
||||
255007211,
|
||||
255007212,
|
||||
255007213
|
||||
255007213,
|
||||
255007315
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
|
||||
@ -451,6 +451,9 @@ const (
|
||||
TableAssist = "assist"
|
||||
TablePlunder = "plunder" // 掠夺
|
||||
TablePlunderLand = "plunderland" // 掠夺岛
|
||||
|
||||
///工会远征
|
||||
TableExpedition = "expedition"
|
||||
)
|
||||
|
||||
// RPC服务接口定义处
|
||||
|
||||
@ -592,19 +592,21 @@ func (this *Buried) TriggerBuried(session comm.IUserSession, burieds ...*pb.Buri
|
||||
|
||||
func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedParam) {
|
||||
var (
|
||||
model *buriedModel
|
||||
pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData)
|
||||
bconf *cfg.GameBuriedTypeData
|
||||
bdatas *pb.DBBuried
|
||||
bdata *pb.DBBuriedItem
|
||||
bitem *pb.DBBuriedConItem
|
||||
ok bool
|
||||
change bool
|
||||
changes []*pb.ConIProgress
|
||||
notify map[string][]*pb.ConIProgress
|
||||
module core.IModule
|
||||
nmodule comm.IBuriedUpdateNotify
|
||||
err error
|
||||
model *buriedModel
|
||||
pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData)
|
||||
bconf *cfg.GameBuriedTypeData
|
||||
resetconf *cfg.GameBuriedCondiData
|
||||
bdatas *pb.DBBuried
|
||||
bdata *pb.DBBuriedItem
|
||||
bitem *pb.DBBuriedConItem
|
||||
resetitem *pb.DBBuriedConItem
|
||||
ok bool
|
||||
change bool
|
||||
changes []*pb.ConIProgress
|
||||
notify map[string][]*pb.ConIProgress
|
||||
module core.IModule
|
||||
nmodule comm.IBuriedUpdateNotify
|
||||
err error
|
||||
)
|
||||
if model, err = this.modelBuried.getburiedModel(session.GetUserId()); err != nil {
|
||||
return
|
||||
@ -679,7 +681,6 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
|
||||
cp.Value = bitem.Value
|
||||
cp.Target = cond.Value
|
||||
cp.State = bitem.Finish
|
||||
|
||||
changes = append(changes, cp)
|
||||
if len(cond.Notify) > 0 {
|
||||
for _, mname := range cond.Notify {
|
||||
@ -694,6 +695,22 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
|
||||
}
|
||||
notify[string(comm.ModuleWtask)] = append(notify[string(comm.ModuleWtask)], cp)
|
||||
}
|
||||
//完成 重置埋点
|
||||
if cp.State == pb.BuriedItemFinishState_buried_finish {
|
||||
if cond.Refresh > 0 { //重置埋点
|
||||
if resetitem, resetconf, err = this.resetburied(bdatas, cond.Refresh); err != nil {
|
||||
this.Error("重置埋点错误!", log.Field{Key: "err", Value: err.Error()})
|
||||
return
|
||||
}
|
||||
cp := comm.GetBuriedConIProgress2()
|
||||
cp.Btype = resetconf.Type
|
||||
cp.Conid = cond.Refresh
|
||||
cp.Value = resetitem.Value
|
||||
cp.Target = resetconf.Value
|
||||
cp.State = resetitem.Finish
|
||||
changes = append(changes, cp)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -883,6 +900,40 @@ func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTyp
|
||||
return
|
||||
}
|
||||
|
||||
func (this *Buried) resetburied(bdatas *pb.DBBuried, cid int32) (item *pb.DBBuriedConItem, conf *cfg.GameBuriedCondiData, err error) {
|
||||
var (
|
||||
bdata *pb.DBBuriedItem
|
||||
ok bool
|
||||
)
|
||||
if conf, err = this.configure.getCondiData(cid); err != nil {
|
||||
this.Errorln(err)
|
||||
return
|
||||
}
|
||||
if bdata, ok = bdatas.Items[conf.Type]; ok {
|
||||
ok = false
|
||||
for _, v := range bdata.Condi {
|
||||
if v.Conid == cid {
|
||||
v.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||
v.Value = 0
|
||||
item = v
|
||||
ok = true
|
||||
}
|
||||
}
|
||||
}
|
||||
if ok {
|
||||
item = &pb.DBBuriedConItem{
|
||||
Conid: cid,
|
||||
State: pb.BuriedItemState_Activated,
|
||||
Value: 0,
|
||||
Statistics: make([]string, 0),
|
||||
Finish: pb.BuriedItemFinishState_buried_unfinish,
|
||||
Timestamp: time.Now().Unix(),
|
||||
}
|
||||
bdata.Condi = append(bdata.Condi, item)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//获取埋点数据
|
||||
func (this *Buried) getburied(session comm.IUserSession) (bdatas *pb.DBBuried, err error) {
|
||||
if ok, mate := session.GetMate(comm.Session_Buried); ok {
|
||||
|
||||
@ -24,7 +24,7 @@ type ModelExpedition struct {
|
||||
|
||||
func (this *ModelExpedition) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
err = this.MCompModel.Init(service, module, comp, options)
|
||||
this.TableName = comm.TableGuildgve
|
||||
this.TableName = comm.TableExpedition
|
||||
this.module = module.(*Expedition)
|
||||
return
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@ import (
|
||||
"go_dreamfactory/modules/enchant"
|
||||
"go_dreamfactory/modules/entertainment"
|
||||
"go_dreamfactory/modules/equipment"
|
||||
"go_dreamfactory/modules/expedition"
|
||||
"go_dreamfactory/modules/forum"
|
||||
"go_dreamfactory/modules/friend"
|
||||
"go_dreamfactory/modules/gameinvite"
|
||||
@ -197,6 +198,7 @@ func main() {
|
||||
monkey.NewModule(),
|
||||
integral.NewModule(),
|
||||
plunder.NewModule(),
|
||||
expedition.NewModule(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@ -14,10 +14,11 @@ type GameBattleScoreData struct {
|
||||
Id int32
|
||||
IType int32
|
||||
ScoreName string
|
||||
PassUnlock int32
|
||||
RankLow int32
|
||||
RankUp int32
|
||||
Grade string
|
||||
Score int32
|
||||
Icon string
|
||||
Grade int32
|
||||
}
|
||||
|
||||
const TypeId_GameBattleScoreData = -1341711992
|
||||
@ -30,10 +31,11 @@ func (_v *GameBattleScoreData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["score_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PassUnlock"].(float64); !_ok_ { err = errors.New("PassUnlock error"); return }; _v.PassUnlock = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Grade, _ok_ = _buf["grade"].(string); !_ok_ { err = errors.New("grade error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = 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["grade"].(float64); !_ok_ { err = errors.New("grade error"); return }; _v.Grade = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@ import "errors"
|
||||
|
||||
type GameBuriedCondiData struct {
|
||||
Id int32
|
||||
Refresh int32
|
||||
Rtype int32
|
||||
Ctype int32
|
||||
Notify []string
|
||||
@ -36,6 +37,7 @@ func (*GameBuriedCondiData) GetTypeId() int32 {
|
||||
|
||||
func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["refresh"].(float64); !_ok_ { err = errors.New("refresh error"); return }; _v.Refresh = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ctype"].(float64); !_ok_ { err = errors.New("ctype error"); return }; _v.Ctype = int32(_tempNum_) }
|
||||
{
|
||||
|
||||
42
sys/configure/structs/Game.ExpeditionBoss.go
Normal file
42
sys/configure/structs/Game.ExpeditionBoss.go
Normal file
@ -0,0 +1,42 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameExpeditionBoss struct {
|
||||
_dataMap map[int32]*GameExpeditionBossData
|
||||
_dataList []*GameExpeditionBossData
|
||||
}
|
||||
|
||||
func NewGameExpeditionBoss(_buf []map[string]interface{}) (*GameExpeditionBoss, error) {
|
||||
_dataList := make([]*GameExpeditionBossData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameExpeditionBossData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameExpeditionBossData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.BossId] = _v
|
||||
}
|
||||
}
|
||||
return &GameExpeditionBoss{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameExpeditionBoss) GetDataMap() map[int32]*GameExpeditionBossData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameExpeditionBoss) GetDataList() []*GameExpeditionBossData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameExpeditionBoss) Get(key int32) *GameExpeditionBossData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
124
sys/configure/structs/Game.ExpeditionBossData.go
Normal file
124
sys/configure/structs/Game.ExpeditionBossData.go
Normal file
@ -0,0 +1,124 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameExpeditionBossData struct {
|
||||
BossId int32
|
||||
BossName string
|
||||
BossLv int32
|
||||
Serial int32
|
||||
Fighting int32
|
||||
BossImg int32
|
||||
KillReward int32
|
||||
FailReward []*Gameatn
|
||||
Race []int32
|
||||
Job []int32
|
||||
Hid []string
|
||||
Color []int32
|
||||
Fight int32
|
||||
}
|
||||
|
||||
const TypeId_GameExpeditionBossData = -271002540
|
||||
|
||||
func (*GameExpeditionBossData) GetTypeId() int32 {
|
||||
return -271002540
|
||||
}
|
||||
|
||||
func (_v *GameExpeditionBossData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_id"].(float64); !_ok_ { err = errors.New("boss_id error"); return }; _v.BossId = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["boss_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BossName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BossName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_lv"].(float64); !_ok_ { err = errors.New("boss_lv error"); return }; _v.BossLv = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["serial"].(float64); !_ok_ { err = errors.New("serial error"); return }; _v.Serial = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fighting"].(float64); !_ok_ { err = errors.New("fighting error"); return }; _v.Fighting = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_img"].(float64); !_ok_ { err = errors.New("boss_img error"); return }; _v.BossImg = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kill_reward"].(float64); !_ok_ { err = errors.New("kill_reward error"); return }; _v.KillReward = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["fail_reward"].([]interface{}); !_ok_ { err = errors.New("fail_reward error"); return }
|
||||
|
||||
_v.FailReward = 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.FailReward = append(_v.FailReward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["race"].([]interface{}); !_ok_ { err = errors.New("race error"); return }
|
||||
|
||||
_v.Race = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Race = append(_v.Race, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["job"].([]interface{}); !_ok_ { err = errors.New("job error"); return }
|
||||
|
||||
_v.Job = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Job = append(_v.Job, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return }
|
||||
|
||||
_v.Hid = 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.Hid = append(_v.Hid, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["color"].([]interface{}); !_ok_ { err = errors.New("color error"); return }
|
||||
|
||||
_v.Color = make([]int32, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
var _list_v_ int32
|
||||
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||
_v.Color = append(_v.Color, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight"].(float64); !_ok_ { err = errors.New("fight error"); return }; _v.Fight = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameExpeditionBossData(_buf map[string]interface{}) (*GameExpeditionBossData, error) {
|
||||
v := &GameExpeditionBossData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@ -345,7 +345,7 @@ type Tables struct {
|
||||
FightingSkilllv *GameFightingSkilllv
|
||||
FightingSkill *GameFightingSkill
|
||||
FightingSkillStar *GameFightingSkillStar
|
||||
ExpeditionBoos *GameExpeditionBoos
|
||||
ExpeditionBoss *GameExpeditionBoss
|
||||
}
|
||||
|
||||
func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
@ -2357,10 +2357,10 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_expeditionboos") ; err != nil {
|
||||
if buf, err = loader("game_expeditionboss") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil {
|
||||
if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tables, nil
|
||||
|
||||
@ -282,7 +282,7 @@ type GameGlobalData struct {
|
||||
GuildSignIn int32
|
||||
EnhancebossPs int32
|
||||
PlunderPvpBattlereadyid int32
|
||||
PlunderPvpCollegeNum int32
|
||||
PlunderPvpCollegeNum *Gameatn
|
||||
PlunderPvpCollegeTime int32
|
||||
}
|
||||
|
||||
@ -1097,7 +1097,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enhanceboss_ps"].(float64); !_ok_ { err = errors.New("enhanceboss_ps error"); return }; _v.EnhancebossPs = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_num"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; _v.PlunderPvpCollegeNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_college_num"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; if _v.PlunderPvpCollegeNum, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user