This commit is contained in:
meixiongfeng 2023-08-16 17:42:06 +08:00
commit 0644ca11f1
22 changed files with 1257 additions and 546 deletions

View File

@ -1230,7 +1230,8 @@
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"24004"
"24004",
"24001"
],
"RedAssistTeam": 0,
"BlueAssistTeam": 720016,

View File

@ -20644,7 +20644,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_727",
"text": "完成一次守护者招募"
"text": "完成一次守护者召唤"
},
"type": 14,
"valid": 0,
@ -20814,7 +20814,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_733",
"text": "冒险之旅【1-3】"
"text": "冒险之旅【1-1】"
},
"type": 61,
"valid": 1,
@ -20826,7 +20826,7 @@
"NPC": 10104,
"value": 1,
"filter": [
1100104
1100101
],
"filter2": [
"关卡ID",
@ -20872,7 +20872,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_735",
"text": "冒险之旅【1-7】"
"text": "冒险之旅【1-2】"
},
"type": 61,
"valid": 1,
@ -20884,7 +20884,7 @@
"NPC": 10124,
"value": 1,
"filter": [
1100113
1100102
],
"filter2": [
"关卡ID",

View File

@ -1310,5 +1310,12 @@
"filter": [
"eq"
]
},
{
"id": 227,
"insert": 1,
"filter": [
"eq"
]
}
]

View File

@ -297,7 +297,7 @@
"color": 3,
"effects": "",
"access": [
156
10040
],
"img": "attr_ps",
"intr": {

View File

@ -47,7 +47,7 @@
"scale": 0.85,
"usetext": {
"key": "gamesummary_fathernode_usetext_3",
"text": "挑战泰坦?别忘了把胜利获得的材料拿给铁匠铺的戈伯,他能帮你打造装备!"
"text": "大战泰坦!打败泰坦获得的材料[color=#ffcc00]拿给铁匠铺的戈伯,他能帮你打造装备[/color]"
}
},
{
@ -64,7 +64,7 @@
"scale": 0.32,
"usetext": {
"key": "gamesummary_fathernode_usetext_4",
"text": "现在是猎魂的时间!胜利获得的材料可以给守护者回响强化!"
"text": "现在是猎魂的时间!胜利获得的材料[color=#ffcc00]可以给守护者回响强化[/color]"
}
},
{
@ -81,7 +81,7 @@
"scale": 0.8,
"usetext": {
"key": "gamesummary_fathernode_usetext_5",
"text": "传说中用梦锻炼自我的地方。获胜后的护身符记得给守护者等级强化"
"text": "传说中用梦锻炼自我的地方。获胜后的护身符[color=#ffcc00]可以给守护者等级强化[/color]"
}
},
{
@ -115,7 +115,7 @@
"scale": 0.65,
"usetext": {
"key": "gamesummary_fathernode_usetext_7",
"text": "点石成金的磨练地!挑战胜利可以获得教习的指导"
"text": "点石成金的磨练地!挑战胜利可以[color=#ffcc00]获得教习在木人桩指导守护者[/color]"
}
},
{
@ -132,7 +132,7 @@
"scale": 0.65,
"usetext": {
"key": "gamesummary_fathernode_usetext_8",
"text": "这里传说拥有无穷无尽的战斗!同样的,奖励也是无穷无尽的"
"text": "这是[color=#ffcc00]每隔十五天[/color]开启的无穷无尽的挑战地!挑战胜利越多奖励越多"
}
},
{

View File

@ -749,7 +749,11 @@
"buzkashi_goal": 2000,
"buzkashi_goalspeed": 800,
"buzkashi_bumpdis": 5,
"stamina_potion": 10000003,
"stamina_potion": {
"a": "item",
"t": "10000003",
"n": 0
},
"fight_ps": 3,
"player_bodychange": 20180,
"mryl_reward": [

View File

@ -508,5 +508,22 @@
"text": "立即前往"
},
"icon": "icon_zm"
},
{
"id": 10040,
"title": {
"key": "itemlink_itemlink_title_31",
"text": "获取体力"
},
"desc": {
"key": "itemlink_itemlink_desc_30",
"text": "打开购买使用体力"
},
"jumpid": 10040,
"btnTitle": {
"key": "itemlink_itemlink_button_1",
"text": "打开"
},
"icon": "icon_zm"
}
]

View File

@ -7,7 +7,7 @@
},
"worldname": {
"key": "mainchapter_main_chapter_worldname_1",
"text": "疯狂原始人的世界"
"text": "原始人聚集地"
},
"chapter_type": 1,
"map": "scenes_chapter_01",

File diff suppressed because it is too large Load Diff

View File

@ -10,13 +10,13 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"hppro": 0.75,
"atkpro": 0.8,
"defpro": 0.1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 95,
"speed": 90,
"modelsize": 1
},
{
@ -30,7 +30,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.1,
"skill1": 1,
@ -50,7 +50,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.1,
"skill1": 1,
@ -70,7 +70,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.1,
"skill1": 1,
@ -90,7 +90,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.3,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.1,
"skill1": 1,
@ -110,7 +110,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -130,7 +130,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -150,7 +150,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -170,7 +170,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -190,7 +190,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -210,7 +210,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -230,7 +230,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -250,7 +250,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -270,7 +270,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -290,7 +290,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -310,7 +310,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -330,7 +330,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -350,7 +350,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -370,7 +370,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -390,7 +390,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.3,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -410,7 +410,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -430,7 +430,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -450,7 +450,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -470,7 +470,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -490,7 +490,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -510,7 +510,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -530,7 +530,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -550,7 +550,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -570,7 +570,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -590,7 +590,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -610,7 +610,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -630,7 +630,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -650,7 +650,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -670,7 +670,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -690,7 +690,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -710,7 +710,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -730,7 +730,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -750,7 +750,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -770,7 +770,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -790,7 +790,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -810,7 +810,7 @@
"equip": [],
"newskill": [],
"lv": 2,
"hppro": 0.6,
"hppro": 0.8,
"atkpro": 0.8,
"defpro": 0.4,
"skill1": 1,
@ -232570,7 +232570,7 @@
"equip": [],
"newskill": [],
"lv": 1,
"hppro": 0.6,
"hppro": 0.3,
"atkpro": 2,
"defpro": 0.1,
"skill1": 1,
@ -232710,7 +232710,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.8,
"hppro": 0.7,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232730,7 +232730,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.8,
"hppro": 0.7,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232750,7 +232750,7 @@
"equip": [],
"newskill": [],
"lv": 4,
"hppro": 0.8,
"hppro": 0.7,
"atkpro": 0.5,
"defpro": 0.1,
"skill1": 1,
@ -232831,12 +232831,12 @@
"newskill": [],
"lv": 3,
"hppro": 0.55,
"atkpro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 61,
"speed": 105,
"modelsize": 1
},
{
@ -232851,12 +232851,12 @@
"newskill": [],
"lv": 3,
"hppro": 0.6,
"atkpro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 74,
"speed": 103,
"modelsize": 1
},
{
@ -232871,12 +232871,12 @@
"newskill": [],
"lv": 3,
"hppro": 0.5,
"atkpro": 0.3,
"atkpro": 0.2,
"defpro": 0.8,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 68,
"speed": 104,
"modelsize": 1
},
{
@ -238276,7 +238276,7 @@
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 80,
"speed": 110,
"modelsize": 1
},
{
@ -238305,7 +238305,7 @@
"captainId": 0,
"IsBoss": 0,
"bossHpCnt": 0,
"heroid": 44005,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],

View File

@ -8,8 +8,8 @@
"n": 1
},
"itempos": {
"x": 1518,
"y": 600
"x": 44,
"y": 185
},
"itemjpg": "item_10000001"
},
@ -22,8 +22,8 @@
"n": 1
},
"itempos": {
"x": 1090,
"y": 638
"x": -384,
"y": 223
},
"itemjpg": "item_10000001"
},
@ -36,8 +36,8 @@
"n": 1
},
"itempos": {
"x": 1881,
"y": 537
"x": 407,
"y": 122
},
"itemjpg": "item_10000001"
},
@ -50,8 +50,8 @@
"n": 1
},
"itempos": {
"x": 1229,
"y": 499
"x": -245,
"y": 84
},
"itemjpg": "item_10000001"
},
@ -64,8 +64,8 @@
"n": 1
},
"itempos": {
"x": 1707,
"y": 463
"x": 233,
"y": 48
},
"itemjpg": "item_10000001"
},
@ -78,8 +78,8 @@
"n": 1
},
"itempos": {
"x": 1518,
"y": 600
"x": 44,
"y": 185
},
"itemjpg": "item_10000001"
},
@ -92,8 +92,8 @@
"n": 1
},
"itempos": {
"x": 1090,
"y": 638
"x": -384,
"y": 223
},
"itemjpg": "item_10000001"
},
@ -106,8 +106,8 @@
"n": 1
},
"itempos": {
"x": 1881,
"y": 537
"x": 407,
"y": 122
},
"itemjpg": "item_10000001"
},
@ -120,8 +120,8 @@
"n": 1
},
"itempos": {
"x": 1229,
"y": 499
"x": -245,
"y": 84
},
"itemjpg": "item_10000001"
},
@ -134,8 +134,8 @@
"n": 1
},
"itempos": {
"x": 1707,
"y": 463
"x": 233,
"y": 48
},
"itemjpg": "item_10000001"
},
@ -148,8 +148,8 @@
"n": 1
},
"itempos": {
"x": 1518,
"y": 600
"x": 44,
"y": 185
},
"itemjpg": "item_10000001"
},
@ -162,8 +162,8 @@
"n": 1
},
"itempos": {
"x": 1090,
"y": 638
"x": -384,
"y": 223
},
"itemjpg": "item_10000001"
},
@ -176,8 +176,8 @@
"n": 1
},
"itempos": {
"x": 1881,
"y": 537
"x": 407,
"y": 122
},
"itemjpg": "item_10000001"
},
@ -190,8 +190,8 @@
"n": 1
},
"itempos": {
"x": 1229,
"y": 499
"x": -245,
"y": 84
},
"itemjpg": "item_10000001"
},
@ -204,8 +204,8 @@
"n": 1
},
"itempos": {
"x": 1707,
"y": 463
"x": 233,
"y": 48
},
"itemjpg": "item_10000001"
}

View File

@ -5810,7 +5810,7 @@
},
"npctxt": {
"key": "worldtask_world_task_npctxt_131",
"text": "阻止亚丝翠"
"text": "阻止亚丝翠"
},
"get_item": [],
"trigger": 0,

View File

@ -844,6 +844,19 @@ const (
Rtype212 TaskType = 212 // 接取任务后,商队抵达指定城市
Rtype213 TaskType = 213 // 消耗X体力
Rtype214 TaskType = 214 // 获得x充值积分
Rtype215 TaskType = 215 // 首次触发指定ID的事件
Rtype216 TaskType = 216 // 上阵英雄都为指定职业,击败石阵秘境中指定关卡的首领
Rtype217 TaskType = 217 // 携带指定ID的buff击败石阵秘境中指定关卡的首领
Rtype218 TaskType = 218 // 携带指定类型、≥指定数量的buff击败石阵秘境中指定关卡的首领
Rtype219 TaskType = 219 // 累计击败石阵秘境任意关卡的首领N次
Rtype220 TaskType = 220 // 在石阵秘境的强化商店中强化N次buff事件类型29
Rtype221 TaskType = 221 // 累计获得N个指定类型的buff
Rtype222 TaskType = 222 // 击败指定关卡的首领时,背包中指定道具数量≥指定数量
Rtype223 TaskType = 223 // 触发指定类型的事件累计N次
Rtype224 TaskType = 224 // 击败石阵秘境中指定关卡的首领时,每名上阵英雄血量≤比例(千分比)
Rtype225 TaskType = 225 // 在石阵秘境中挑战指定类型的战斗关卡普通14首领28失败N次
Rtype226 TaskType = 226 // 击败石阵秘境中指定关卡的首领时,背包中指定道具数量=指定数量
Rtype227 TaskType = 227 // 指定ID战斗失败
)
const (
MailLineEasy int32 = 1 // 简单

View File

@ -63,10 +63,22 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
Index: 0,
}
}
if info.Npc[req.Pid].Index != 0 {
if errdata = this.module.DispenseRes(session, npc.NpcReward, true); errdata != nil {
return
}
} else {
if errdata = this.module.DispenseRes(session, npc.NewNpcReward, true); errdata != nil {
return
}
}
if len(npc.MonsterformatId) > int(info.Npc[req.Pid].Index+1) {
info.Npc[req.Pid].Index++
}
info.Npc[req.Pid].Cd = configure.Now().Add(time.Minute * time.Duration(npc.ReviveCd)).Unix()
if err = this.module.modelArena.Change(info.Uid, map[string]interface{}{
"npc": info.Npc,
}); err != nil {
@ -79,7 +91,6 @@ func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewa
return
}
this.module.DispenseRes(session, npc.NpcReward, true)
session.SendMsg(string(this.module.GetType()), "plotreward", &pb.ArenaPlotRewardResp{
Issucc: true,
Npc: info.Npc,

View File

@ -91,7 +91,7 @@ func (this *ModelMline) updateprogress(data *pb.DBMainline) {
}
chapteraward[conf.Chapterid].Stage++
}
if conf.Episodetype != 8 {
if conf.Episodetype != 8 && conf.Episodetype != 0 {
if _, ok = exploreaward[conf.Chapterid]; !ok {
exploreaward[conf.Chapterid] = &pb.DBMainlineAward{}
}

View File

@ -646,17 +646,28 @@ func (this *ModuleBase) Panicln(args ...interface{}) {
// 发放资源
func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (errdata *pb.ErrorData, atno []*pb.UserAtno) {
var (
items map[string]int32 // 道具背包 批量处理
heros map[string]int32 // 英雄
attrs map[string]int32 // 属性
equips map[string]uint32 // 装备
vip map[string]int32 // vip
items map[string]int32 // 道具背包 批量处理
heros map[string]int32 // 英雄
attrs map[string]int32 // 属性
equips map[string]uint32 // 装备
vip map[string]int32 // vip
atlas map[string]int32 // 铁匠铺资源
panda map[string]int32 // 熊猫武馆资源
mts map[string]int32 // 捕羊大赛资源
per map[string]int32 // 捕羊大赛资源
equipschange []*pb.DB_Equipment
heroschange []*pb.UserAtno
itemschange []*pb.UserAtno
)
items = make(map[string]int32, 0)
heros = make(map[string]int32, 0)
attrs = make(map[string]int32, 0)
equips = make(map[string]uint32, 0)
vip = make(map[string]int32, 0)
atlas = make(map[string]int32, 0)
panda = make(map[string]int32, 0)
mts = make(map[string]int32, 0)
per = make(map[string]int32, 0)
for _, v := range res {
switch v.A {
@ -672,38 +683,52 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
}
case comm.VipType:
vip[v.T] += v.N
case comm.AtlasType:
atlas[v.T] = 1
case comm.PandaType:
panda[v.T] = 1
case comm.MountsType:
mts[v.T] = 1
case comm.PerType:
per[v.T] = 1
default:
this.Error("not found res type", log.Field{Key: "Type", Value: v.A}) // 找不到资源类型
}
}
if len(attrs) > 0 { //用户属性资源
errdata = this.ModuleUser.AddAttributeValues(session, attrs, bPush)
this.Debugf("发放用户资源: %v [%v]", attrs, errdata)
if errdata = this.ModuleUser.AddAttributeValues(session, attrs, bPush); errdata != nil {
return
}
for k, v := range attrs {
atno = append(atno, &pb.UserAtno{
A: "attr",
A: comm.AttrType,
T: k,
N: v,
O: "",
})
}
this.Debugf("发放用户资源: %v errdata: %v", attrs, errdata)
}
if len(items) > 0 { //道具资源
_atno, code := this.ModuleItems.AddItems(session, items, bPush)
errdata = code
atno = append(atno, _atno...)
this.Debugf("发放道具资源: %v [%v]", _atno, code)
if itemschange, errdata = this.ModuleItems.AddItems(session, items, bPush); errdata != nil {
return
}
atno = append(atno, itemschange...)
this.Debugf("发放道具资源: %v errdata: %v", items, errdata)
}
if len(heros) > 0 { //卡片资源
hero, atn, code := this.ModuleHero.CreateRepeatHeros(session, heros, bPush)
this.Debugf("发放英雄资源: %v [%v]", hero, code)
atno = append(atno, atn...)
if _, heroschange, errdata = this.ModuleHero.CreateRepeatHeros(session, heros, bPush); errdata != nil {
return
}
atno = append(atno, heroschange...)
this.Debugf("发放英雄资源: %v errdata: %v", heros, errdata)
}
if len(equips) > 0 {
change, code := this.ModuleEquipment.AddNewEquipments(session, equips, bPush)
this.Debugf("发放装备资源: %v [%v]", equips, code)
for _, v := range change {
if equipschange, errdata = this.ModuleEquipment.AddNewEquipments(session, equips, bPush); errdata != nil {
return
}
for _, v := range equipschange {
atno = append(atno, &pb.UserAtno{
A: "equi",
T: v.CId,
@ -711,13 +736,72 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea
O: v.Id,
})
}
this.Debugf("发放装备资源: %v errdata: %v", equips, errdata)
}
if len(vip) > 0 { //卡片资源
for k := range vip {
errdata, _ = this.ModulePrivilege.Delivery(session, k)
this.Debugf("发放月卡资源: %v [%v]", k, errdata)
this.Debugf("发放月卡资源: %v errdata: %v", k, errdata)
}
for k, v := range vip {
atno = append(atno, &pb.UserAtno{
A: comm.VipType,
T: k,
N: v,
})
}
}
if len(atlas) > 0 {
for k := range atlas {
this.ModuleSmithy.CheckActivateAtlasCollect(session.GetUserId(), k)
this.Debugf("发放图鉴资源: %v errdata: %v", k, errdata)
}
for k, v := range atlas {
atno = append(atno, &pb.UserAtno{
A: comm.AtlasType,
T: k,
N: v,
})
}
}
if len(panda) > 0 {
if errdata = this.ModulePractice.AddItems(session, panda, bPush); errdata != nil {
return
}
for k, v := range panda {
atno = append(atno, &pb.UserAtno{
A: comm.PandaType,
T: k,
N: v,
})
}
this.Debugf("发放武馆资源: %v errdata: %v", panda, errdata)
}
if len(mts) > 0 {
if errdata = this.ModuleParkour.AddMounts(session, mts, bPush); errdata != nil {
return
}
for k, v := range mts {
atno = append(atno, &pb.UserAtno{
A: comm.MountsType,
T: k,
N: v,
})
}
this.Debugf("发放捕羊大赛资源: %v errdata: %v", mts, errdata)
}
if len(per) > 0 {
if errdata = this.ModuleUser.AddPer(session, per, bPush); errdata != nil {
return
}
for k, v := range per {
atno = append(atno, &pb.UserAtno{
A: comm.PerType,
T: k,
N: v,
})
}
this.Debugf("发放用户皮肤资源资源: %v errdata: %v", mts, errdata)
}
return
}

View File

@ -188,7 +188,7 @@ func (this *Pagoda) CheckPoint29101(uid string) (activated bool, progress int32)
if v.Race < 10 { // 10以内的是阵营塔
var defeat int32
// 校验今天是否开启
if c, err := this.configure.GetPagodaCirculateConf(v.Race, v.Curfloor); err != nil {
if c, err := this.configure.GetPagodaCirculateConf(v.Race, v.Curfloor); err == nil {
for _, v1 := range c.Openingtime {
if curWeekDay == v1 {
if utils.IsToday(v.Rtime) {

View File

@ -138,7 +138,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "days no achieve",
Message: fmt.Sprintf("days:%d no achieve", days),
}
return
}

View File

@ -66,18 +66,18 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
}
//初始体力
var ps int32
gpd := this.module.configure.GetPlayerlvConf(self.Lv)
if gpd != nil {
ps = gpd.PsCeiling
}
// var ps int32
// gpd := this.module.configure.GetPlayerlvConf(self.Lv)
// if gpd != nil {
// ps = gpd.PsCeiling
// }
update := map[string]interface{}{
"name": req.NickName, //设置昵称
"created": true, //创角标识
"figure": req.Figure, //设置形象
"gender": req.Gender, //设置性别
"ps": ps, //设置初始体力
"ps": 0, //设置初始体力 调整未0 由策划初始表发放
"caravanlv": 1,
}

View File

@ -67,10 +67,11 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle
go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId))
}
} else {
this.module.Error("世界任务战斗失败",
log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "isWin", Value: isWin},
)
go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype227, 1, req.BattleConfId))
// this.module.Error("世界任务战斗失败",
// log.Field{Key: "uid", Value: session.GetUserId()},
// log.Field{Key: "isWin", Value: isWin},
// )
}
session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId})
return

View File

@ -30,6 +30,7 @@ type GameMainStageData struct {
Hide int32
Destroy int32
Progress int32
Stroyshow int32
Frontstoryid int32
Afterstoryid int32
MaingroupName string
@ -118,6 +119,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hide"].(float64); !_ok_ { err = errors.New("hide error"); return }; _v.Hide = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["destroy"].(float64); !_ok_ { err = errors.New("destroy error"); return }; _v.Destroy = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["progress"].(float64); !_ok_ { err = errors.New("progress error"); return }; _v.Progress = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stroyshow"].(float64); !_ok_ { err = errors.New("stroyshow error"); return }; _v.Stroyshow = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["frontstoryid"].(float64); !_ok_ { err = errors.New("frontstoryid error"); return }; _v.Frontstoryid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["afterstoryid"].(float64); !_ok_ { err = errors.New("afterstoryid error"); return }; _v.Afterstoryid = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["maingroupName"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.MaingroupName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.MaingroupName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

View File

@ -241,7 +241,7 @@ type GameGlobalData struct {
BuzkashiGoal int32
BuzkashiGoalspeed int32
BuzkashiBumpdis float32
StaminaPotion int32
StaminaPotion *Gameatn
FightPs int32
PlayerBodychange int32
MrylReward []*Gameatn
@ -994,7 +994,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["stamina_potion"].(map[string]interface{}); !_ok_ { err = errors.New("stamina_potion error"); return }; if _v.StaminaPotion, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["player_bodychange"].(float64); !_ok_ { err = errors.New("player_bodychange error"); return }; _v.PlayerBodychange = int32(_tempNum_) }
{