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

bin/json/game_battleready.json

@@ -1776,7 +1776,7 @@
     "disableAiCamera": 1,
     "ChoseCamp": [],
     "DisableCamp": [],
-    "DefaultHero": 0,
+    "DefaultHero": 720021,
     "ChoseHero": [],
     "DisableHero": [],
     "LockSlots": [

bin/json/game_buzkashimount.json

@@ -267,7 +267,7 @@
       "text": "葛伦科是巨石类龙，长约4米，高约1.7米，全身披满装甲，尾巴像一个锤子，体态较胖。鱼脚司是他的好朋友（更像父亲），起名为肉球。"
     },
     "Color": 3,
-    "Img": "tx_by_54103",
+    "Img": "tx_by_54103_3",
     "access": [
       10041
     ],

bin/json/game_caravanpaper.json

@@ -24,7 +24,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_2",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "今日，超人气天团坏蛋联盟亮相美术馆，引起狂热民众跟随，现场一度因骚动引来大量警力维护秩序。四人在警方保护下与馆中珍藏金海豚合影后便匆匆离开。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -39,7 +39,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_3",
-      "text": "阿宝在博格城偷吃被捕"
+      "text": "本市第一龙头企业宝贝集团发布宝贝奶瓶七系！据称这是有史以来改变最大的奶瓶，曲线型设计，九十八种营养配方，并有多种颜色选择。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -54,7 +54,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_4",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "精灵群星巡演开启！王牌歌后波比女王领衔，据悉她将公布新专辑首发曲目。同时摇滚女王巴布，戴塔戴恩，约德尔歌手等众多大腕也倾情加盟。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -69,7 +69,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_5",
-      "text": "阿宝在加菲斯特城偷吃被捕"
+      "text": "想拥有一场治愈有趣的旅行吗？那就赶快来参加童话王国举办的梦幻航海之旅吧！在靴猫和贫嘴驴的陪伴下，度过七天的快乐时光！"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -114,7 +114,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_8",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "振奋人心！恐惧灵大军被翡翠宫神龙大侠阿宝成功击退，再起不能！和平谷解除危机。据小道消息称，阿宝最新系列玩偶已经全部售罄。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -159,7 +159,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_11",
-      "text": "阿宝在博格城偷吃被捕"
+      "text": "近日中轴城频繁有居民反映，在夜晚看见黑色不明生物在上空飞行。记者跟进得知该生物常飞往北方，也许是维京人饲养的神奇生物。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -174,7 +174,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_12",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "一股最新的寒潮即将来袭！据家住雪山的市民诺斯先生反应，这股寒潮很可能是冰霜杰克搞的鬼，其目的是为了让圣诞节提前到来，让诺斯先生加班完成工作。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -204,7 +204,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_14",
-      "text": "阿宝在和平城偷吃被捕"
+      "text": "洞穴墙壁为何有殷红血手印？半夜三更为何狼嚎阵阵？乳臭小孩为何行为像狗？洞穴人到底如何生存？让我们走进洞穴，带大家解谜咕噜一家的奥秘。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -234,7 +234,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_16",
-      "text": "阿宝在贝特曼城偷吃被捕"
+      "text": "全球巡演的超火爆人气马戏团萨拉戈萨来临！台柱雄狮亚历克斯将和他的伙伴们一起为大家献上极致绚丽的视听盛宴！"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0
@@ -249,7 +249,7 @@
     },
     "newspaper_txt": {
       "key": "caravan_caravan_paper_newspaper_txt_17",
-      "text": "阿宝在加菲斯特城偷吃被捕"
+      "text": "今日，超人气天团坏蛋联盟亮相美术馆，引起狂热民众跟随，现场一度因骚动引来大量警力维护秩序。四人在警方保护下与馆中珍藏金海豚合影后便匆匆离开。"
     },
     "newspaper_picture": "jgsd_bz_pt_hdlm",
     "weight": 0

bin/json/game_combatbox.json

@@ -73,11 +73,11 @@
   },
   {
     "id": 10301,
-    "drop": 16001001
+    "drop": 16001002
   },
   {
     "id": 10302,
-    "drop": 16001001
+    "drop": 16001002
   },
   {
     "id": 10303,

bin/json/game_gamesummary.json

@@ -15,7 +15,7 @@
     "jumpId": 166,
     "introduce": {
       "key": "gamesummary_node_introdunce_1",
-      "text": "故事的开始起于一场冒险，那时候谁也不知道，这将是一次漫长又精彩非凡的旅程。"
+      "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
     },
     "bg": "hkz_wftj_zxgk",
     "icon": "hkz_tx_zxgk",
@@ -48,7 +48,7 @@
     "jumpId": 10015,
     "introduce": {
       "key": "gamesummary_node_introdunce_2",
-      "text": "一流剑客靴猫喜欢比武，他在此建立了一个竞技场，看看城中谁才是最强。"
+      "text": "靴猫继续把玩着手中的剑，他在等，等候那些跃跃欲试站在台上的人，等着那个最强的勇者。"
     },
     "bg": "hkz_wftj_jjc",
     "icon": "hkz_tx_jjc",
@@ -76,7 +76,7 @@
     "jumpId": 10023,
     "introduce": {
       "key": "gamesummary_node_introdunce_3",
-      "text": "月圆之夜，原始人吃光了贡品。被愤怒和饥饿所支配的猩猩发出了震耳欲聋的咆哮。他要让那些狂妄之徒吃点苦头。"
+      "text": "月圆之夜，饥饿的猩猩疯狂咆哮着，它决心给那些吃掉贡品的狂徒尝尝很多点苦头。"
     },
     "bg": "hkz_wftj_sl02",
     "icon": "wjyz_img016",
@@ -114,7 +114,7 @@
     "jumpId": 10025,
     "introduce": {
       "key": "gamesummary_node_introdunce_4",
-      "text": "大厨因为没抓到精灵们而被放逐，对精灵恨之入骨，誓要将精灵赶尽杀绝。夜深无人处，时常能听见她咬牙切齿的诅咒声。"
+      "text": "夜半三更，又传来大厨咬牙切齿的诅咒声。自从被精灵戏耍遭到放逐后，她便日夜赌咒要将精灵赶尽杀绝。"
     },
     "bg": "hkz_wftj_sl01",
     "icon": "wjyz_img014",
@@ -152,7 +152,7 @@
     "jumpId": 10026,
     "introduce": {
       "key": "gamesummary_node_introdunce_5",
-      "text": "波波星人带走了戈格星人的孩子，自此戈格星人开始了对波波星人的追击之旅。焦急和恼怒已经吞噬了他的理智。"
+      "text": "波波星人夺走了戈格星人的孩子！焦急和恼怒吞噬了戈格星人的理智，自此他便对波波星人穷追不舍。"
     },
     "bg": "hkz_wftj_sl03",
     "icon": "wjyz_img017",
@@ -190,7 +190,7 @@
     "jumpId": 10024,
     "introduce": {
       "key": "gamesummary_node_introdunce_6",
-      "text": "盘踞在城堡中看守着财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。累累的白骨是她给闯入者们的教训。"
+      "text": "盘踞在城堡中看守财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。累累的白骨是她给闯入者们的警示。"
     },
     "bg": "hkz_wftj_sl04",
     "icon": "wjyz_img015",
@@ -228,7 +228,7 @@
     "jumpId": 10022,
     "introduce": {
       "key": "gamesummary_node_introdunce_7",
-      "text": "贝洛克唤醒沉睡千年的火焰泰坦，身上不断掉落着烈焰，将大地燃烧殆尽，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "火焰泰坦从海域缓缓升起，身上不断掉落着烈焰，那烈焰将大地燃烧殆尽。"
     },
     "bg": "hkz_wftj_wjyz03",
     "icon": "wjyz_img012",
@@ -271,7 +271,7 @@
     "jumpId": 10020,
     "introduce": {
       "key": "gamesummary_node_introdunce_8",
-      "text": "斯卡尔唤醒沉睡千年的冰霜泰坦，冰块从他冰冷的眼中掉落，所过之处皆冻结成冰山，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "冰霜泰坦突破了极寒的冰层，冰块从他冰冷的眼中掉落，所过之处皆冻结成冰山。"
     },
     "bg": "hkz_wftj_wjyz02",
     "icon": "wjyz_img011",
@@ -314,7 +314,7 @@
     "jumpId": 10021,
     "introduce": {
       "key": "gamesummary_node_introdunce_9",
-      "text": "贝洛克与斯卡尔胁迫娜璃唤醒沉睡千年的森林泰坦，她将手张开，手中的藤蔓滑落入地，蜿蜒千里，三泰坦一旦汇合，世界将因此毁灭。"
+      "text": "森林泰坦现身于龟裂的大地之上，她张开双臂，数不胜数的藤蔓滑落入地生根，蜿蜒千里。"
     },
     "bg": "hkz_wftj_wjyz01",
     "icon": "wjyz_img013",
@@ -357,7 +357,7 @@
     "jumpId": 10013,
     "introduce": {
       "key": "gamesummary_node_introdunce_10",
-      "text": "美丽，梦幻与诡异兼具，这便是沙人建造的梦境回廊。守护者们可在此磨练技艺。"
+      "text": "美丽梦幻与诡异兼具，这便是沙人建造的梦境回廊。进入的守护者们或超越自我，或沉迷其中不愿醒来。"
     },
     "bg": "hkz_wftj_jyfb",
     "icon": "hkz_tx_jyfb",
@@ -499,7 +499,7 @@
     "jumpId": 11001,
     "introduce": {
       "key": "gamesummary_node_introdunce_14",
-      "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！为了充实巨怪市集，巨怪们踏上了列车，开启了漫长的旅途。"
+      "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！巨怪们踏上了列车，开始了漫长的旅途。"
     },
     "bg": "hkz_wftj_jgsd",
     "icon": "hkz_tx_jgsd",
@@ -532,7 +532,7 @@
     "jumpId": 10027,
     "introduce": {
       "key": "gamesummary_node_introdunce_16",
-      "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，原始人们是如何从这里逃出生天的呢？"
+      "text": "史前板块运动形成的天然巨石阵迷宫，道路错综复杂，幽深莫测，似乎永无尽头。"
     },
     "bg": "hkz_wftj_mj",
     "icon": "hkz_tx_mj",

bin/json/game_global.json

@@ -851,7 +851,7 @@
       "n": 200
     },
     "dragon_interaction": 15,
-    "dialogueclickcd": 1,
+    "dialogueclickcd": 0.3,
     "doragon_item": "24012003",
     "sign_account": 28
   }

bin/json/game_gm.json

@@ -449,26 +449,6 @@
     "data": "102",
     "prefix": ""
   },
-  {
-    "id": 46,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_51",
-      "text": "查看周常任务"
-    },
-    "data": "110",
-    "prefix": ""
-  },
-  {
-    "id": 47,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_52",
-      "text": "前往成就任务"
-    },
-    "data": "111",
-    "prefix": ""
-  },
   {
     "id": 48,
     "type": 4,
@@ -619,16 +599,6 @@
     "data": "171",
     "prefix": ""
   },
-  {
-    "id": 63,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_71",
-      "text": "打开俱乐部boss（需加入公会）"
-    },
-    "data": "172",
-    "prefix": ""
-  },
   {
     "id": 64,
     "type": 4,
@@ -649,16 +619,6 @@
     "data": "721",
     "prefix": ""
   },
-  {
-    "id": 66,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_74",
-      "text": "进行锻造"
-    },
-    "data": "1001",
-    "prefix": ""
-  },
   {
     "id": 67,
     "type": 4,
@@ -749,16 +709,6 @@
     "data": "905",
     "prefix": ""
   },
-  {
-    "id": 78,
-    "type": 4,
-    "text": {
-      "key": "GM_GM_text_88",
-      "text": "前往俱乐部"
-    },
-    "data": "907",
-    "prefix": ""
-  },
   {
     "id": 79,
     "type": 4,

bin/json/game_lottery.json

@@ -90482,12 +90482,36 @@
   {
     "id": 3771,
     "lotteryid": 16001001,
-    "description": "记忆碎片第1章第1关",
+    "description": "记忆碎片第1章第1关怪物深厚的宝箱",
     "type": 1,
     "groupwt": 1,
     "groupid": 1001,
     "subtype": 1,
-    "groupnum": 2,
+    "groupnum": 4,
+    "itemid": {
+      "a": "item",
+      "t": "16001001",
+      "n": 1
+    },
+    "itemdes": "",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 3772,
+    "lotteryid": 16001002,
+    "description": "记忆碎片第1章第1关其他2个宝箱",
+    "type": 1,
+    "groupwt": 1,
+    "groupid": 1001,
+    "subtype": 1,
+    "groupnum": 1,
     "itemid": {
       "a": "item",
       "t": "16001001",

bin/json/game_mainstage.json

@@ -2624,7 +2624,7 @@
     "destroy": 1,
     "progress": 1,
     "stroyshow": 0,
-    "frontstoryid": 300380,
+    "frontstoryid": 200380,
     "afterstoryid": 0,
     "maingroupName": {
       "key": "",

bin/json/game_monsterformat.json

@@ -238172,7 +238172,7 @@
     "equip": [],
     "newskill": [],
     "lv": 1,
-    "hppro": 0.3,
+    "hppro": 0.2,
     "atkpro": 1,
     "defpro": 1,
     "skill1": 1,
@@ -238383,6 +238383,26 @@
     "speed": 140,
     "modelsize": 1
   },
+  {
+    "Id": 720021,
+    "pos": 1,
+    "captainId": 0,
+    "IsBoss": 0,
+    "bossHpCnt": 0,
+    "heroid": 14003,
+    "star": 4,
+    "equip": [],
+    "newskill": [],
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 140,
+    "modelsize": 1
+  },
   {
     "Id": 800001,
     "pos": 1,

bin/json/game_shop.json

@@ -61,11 +61,11 @@
     "tab": 3,
     "shopname": {
       "key": "shop_shop_shopname_3",
-      "text": "友情商店"
+      "text": "友情专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_3",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 1,
@@ -85,11 +85,11 @@
     "tab": 4,
     "shopname": {
       "key": "shop_shop_shopname_4",
-      "text": "竞技商店"
+      "text": "斗士专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_4",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 7,
@@ -111,11 +111,11 @@
     "tab": 5,
     "shopname": {
       "key": "shop_shop_shopname_5",
-      "text": "俱乐部商店"
+      "text": "名流专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_5",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 7,
@@ -137,11 +137,11 @@
     "tab": 6,
     "shopname": {
       "key": "shop_shop_shopname_6",
-      "text": "守护者商店"
+      "text": "守护专柜"
     },
     "upper_shop": {
       "key": "shop_shop_upper_shop_6",
-      "text": "玩法商店"
+      "text": "奇趣商店"
     },
     "rtype": 2,
     "rtime": 21,

bin/json/game_skillafteratk.json

@@ -51800,7 +51800,30 @@
       390001401,
       1000,
       1,
-      1
+      2
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 813002215,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300223,
+      -1,
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -52245,7 +52268,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414007211,
+      481400721,
       -1,
       -1
     ],
@@ -52292,7 +52315,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414007211,
+      481400722,
       -1,
       -1
     ],
@@ -52339,7 +52362,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      481400721,
+      481400723,
       -1,
       -1
     ],
@@ -52426,7 +52449,7 @@
   {
     "Id": 814003213,
     "EmitPR": 1000,
-    "From": 4,
+    "From": 3,
     "Where": [],
     "Order": "",
     "Limit": 10,
@@ -52436,7 +52459,7 @@
       391000014,
       1000,
       1,
-      2
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -52481,7 +52504,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      484500321,
+      481400322,
       -1,
       -1
     ],
@@ -52504,7 +52527,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      484500322,
+      484500321,
       -1,
       -1
     ],
@@ -53919,6 +53942,29 @@
     "RevisiCondition": "",
     "RevisiParams": []
   },
+  {
+    "Id": 813004216,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300423,
+      -1,
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
   {
     "Id": 833003111,
     "EmitPR": 1000,
@@ -54705,7 +54751,30 @@
       391000085,
       1000,
       1,
-      1
+      -1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 813001216,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 2,
+    "Argu": [
+      481300123,
+      -1,
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -54750,7 +54819,7 @@
     "ExecuteCnt": 1,
     "Type": 2,
     "Argu": [
-      414005211,
+      481400521,
       -1,
       -1
     ],
@@ -55268,7 +55337,7 @@
       390001004,
       1000,
       1,
-      2
+      4
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -55292,7 +55361,7 @@
       390001001,
       1000,
       1,
-      1
+      2
     ],
     "FollowSK": [],
     "SucFollowSK": [],

bin/json/game_skillatk.json

@@ -13585,7 +13585,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004213
       ]
     },
@@ -13595,8 +13594,7 @@
       "text": "法夸德勋爵对敌方1个目标发起攻击，造成攻击力300%的伤害，并为自身附加2回合[color=#37d8a9]攻击提升[/color]状态和2回合[color=#37d8a9]殊死较量[/color]状态。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13620,7 +13618,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004223
       ]
     },
@@ -13630,8 +13627,7 @@
       "text": "伤害提升至330%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13655,7 +13651,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004233
       ]
     },
@@ -13665,8 +13660,7 @@
       "text": "伤害提升至360%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13690,7 +13684,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004243
       ]
     },
@@ -13700,8 +13693,7 @@
       "text": "伤害提升至390%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -13725,7 +13717,6 @@
     "ChildSkill": {
       "Id": [
         213004211,
-        213004212,
         213004253
       ]
     },
@@ -13735,8 +13726,7 @@
       "text": "伤害提升至430%。"
     },
     "buffid": [
-      390001001,
+      390001001
-      390001104
     ],
     "map": ""
   },
@@ -38402,10 +38392,12 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        813004215
+        813004216
       ]
     },
-    "passSkill": [],
+    "passSkill": [
+      813004216
+    ],
     "Desc": {
       "key": "skill_skill_atk_Desc_813004423_1",
       "text": "释放2技能后30%概率为自身添加2回合【殊死较量】状态"
@@ -42754,7 +42746,7 @@
     "Target": 0,
     "ChildSkill": {
       "Id": [
-        934002311
+        934002316
       ]
     },
     "passSkill": [],

bin/json/game_skillbuff.json

@@ -8571,7 +8571,6 @@
       23,
       1,
       2,
-      2,
       30
     ],
     "BufParNum": 1,
@@ -8869,9 +8868,7 @@
     },
     "BuffType": 112,
     "EffectArgu": [
-      14,
+      120
-      120,
-      0
     ],
     "BufParNum": 1,
     "RelyCheckArgu": [],
@@ -11245,7 +11242,7 @@
     "OverlayTimes": 3,
     "SameID": false,
     "golbalbufficon": "",
-    "buffIcon": "ty_icon_buff_shts10",
+    "buffIcon": "",
     "buffeffect": "",
     "buffpos": "根节点",
     "forbidFloat": 0

bin/json/game_skillpassive.json

@@ -1403,7 +1403,7 @@
     "When": 16,
     "FromCheck": "Target=3",
     "TargetCheck": "Target=2,Nobuff=3",
-    "MainSkillCheck": "",
+    "MainSkillCheck": "MainSkillID=114005211",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -5567,9 +5567,9 @@
   },
   {
     "Id": 481300221,
-    "When": 15,
+    "When": 4,
     "FromCheck": "",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,Hpproless=500",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -5587,10 +5587,10 @@
   },
   {
     "Id": 481300222,
-    "When": 15,
+    "When": 16,
-    "FromCheck": "Target=3",
+    "FromCheck": "",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=2,HasBuff=390001401",
-    "MainSkillCheck": "",
+    "MainSkillCheck": "SkillPos=2",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "DpsCheck": "",
@@ -5602,12 +5602,12 @@
     "MaxEmitTimes": 0,
     "MaxEmitTimesInRound": 0,
     "Callback": [
-      813002215
+      813002214
     ]
   },
   {
     "Id": 481300321,
-    "When": 2,
+    "When": 16,
     "FromCheck": "",
     "TargetCheck": "Target=3,Hpproless=600",
     "MainSkillCheck": "",
@@ -5808,8 +5808,8 @@
   {
     "Id": 481400521,
     "When": 15,
-    "FromCheck": "",
+    "FromCheck": "Target=3",
-    "TargetCheck": "Target=3",
+    "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -5887,7 +5887,7 @@
   },
   {
     "Id": 481500221,
-    "When": 2,
+    "When": 16,
     "FromCheck": "",
     "TargetCheck": "Target=3,HpproGreater=600",
     "MainSkillCheck": "",
@@ -8838,5 +8838,68 @@
     "Callback": [
       934002311
     ]
+<<<<<<< HEAD
+  },
+  {
+    "Id": 481300223,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=1",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      813002111
+    ]
+  },
+  {
+    "Id": 481300423,
+    "When": 16,
+    "FromCheck": "Target=3",
+    "TargetCheck": "",
+    "MainSkillCheck": "SkillPos=2",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      813004215
+    ]
+  },
+  {
+    "Id": 481400322,
+    "When": 16,
+    "FromCheck": "",
+    "TargetCheck": "Target=2",
+    "MainSkillCheck": "SkillPos=2",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      814003214
+    ]
+=======
+>>>>>>> 61db84522abaac01acc58fffb57e5601d35ad929
   }
 ]

modules/gateway/agentmgr_comp.go

@@ -94,6 +94,16 @@ func (this *AgentMgrComp) DisConnect(a IAgent) {
 		}, nil); err != nil {
 			log.Errorf("uId:%s Rpc_NoticeUserClose err:%v", a.UserId(), err)
 		}
+
+		if _, err := this.service.AcrossClusterRpcGo(context.Background(), db.CrossTag(), comm.Service_Mainte, string(comm.Rpc_GatewayNoticeUserClose), &pb.NoticeUserCloseReq{
+			Ip:               a.IP(),
+			ServiceTag:       this.service.GetTag(),
+			GatewayServiceId: this.service.GetId(),
+			UserSessionId:    a.SessionId(),
+			UserId:           a.UserId(),
+		}, nil); err != nil {
+			log.Errorf("uId:%s Rpc_NoticeUserClose err:%v", a.UserId(), err)
+		}
 		// }
 	}
 }

modules/wtask/module.go

@@ -344,19 +344,21 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, dailytaskid int
 	wtask.Dailytaskgroup = dailytaskid
 	wtask.Exchange = make(map[int32]int32)
 	wtask.Events = make(map[int32]int32)
-	if len(condiIds) > 0 {
+	// if len(condiIds) > 0 {
-		// if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
+	// if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil {
-		// 	errdata = &pb.ErrorData{
+	// 	errdata = &pb.ErrorData{
-		// 		Code:    pb.ErrorCode_ExternalModule,
+	// 		Code:    pb.ErrorCode_ExternalModule,
-		// 		Title:   pb.ErrorCode_ExternalModule.ToString(),
+	// 		Title:   pb.ErrorCode_ExternalModule.ToString(),
-		// 		Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds),
+	// 		Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds),
-		// 	}
+	// 	}
-		// 	return
+	// 	return
-		// }
+	// }
-	}
+	// }
 
 	//有新任务接取
-	this.pushtaskprogress(session, wtask, true)
+	// this.pushtaskprogress(session, wtask, true)
+	//推送日常任务信息
+	session.SendMsg(string(this.GetType()), "dailytaskchange", &pb.WTaskDailytaskChangePush{Dailytaskgroup: wtask.Dailytaskgroup, Activations: wtask.Activations})
 	if boxchange {
 		session.SendMsg(string(this.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs})
 	}

pb/wtask_msg.pb.go

@@ -1523,6 +1523,62 @@ func (x *WTaskEventCompleteResp) GetAward() []*UserAtno {
 	return nil
 }
 
+//日常任务信息推送
+type WTaskDailytaskChangePush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Dailytaskgroup int32   `protobuf:"varint,1,opt,name=dailytaskgroup,proto3" json:"dailytaskgroup"`  //日常任务组id
+	Activations    []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+}
+
+func (x *WTaskDailytaskChangePush) Reset() {
+	*x = WTaskDailytaskChangePush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_wtask_wtask_msg_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WTaskDailytaskChangePush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WTaskDailytaskChangePush) ProtoMessage() {}
+
+func (x *WTaskDailytaskChangePush) ProtoReflect() protoreflect.Message {
+	mi := &file_wtask_wtask_msg_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use WTaskDailytaskChangePush.ProtoReflect.Descriptor instead.
+func (*WTaskDailytaskChangePush) Descriptor() ([]byte, []int) {
+	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *WTaskDailytaskChangePush) GetDailytaskgroup() int32 {
+	if x != nil {
+		return x.Dailytaskgroup
+	}
+	return 0
+}
+
+func (x *WTaskDailytaskChangePush) GetActivations() []int32 {
+	if x != nil {
+		return x.Activations
+	}
+	return nil
+}
+
 var File_wtask_wtask_msg_proto protoreflect.FileDescriptor
 
 var file_wtask_wtask_msg_proto_rawDesc = []byte{
@@ -1673,8 +1729,15 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
 	0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e,
 	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f,
 	0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42,
+	0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x0a, 0x18, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73,
+	0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x0e, 0x64,
+	0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1689,7 +1752,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
 	return file_wtask_wtask_msg_proto_rawDescData
 }
 
-var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
+var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
 var file_wtask_wtask_msg_proto_goTypes = []interface{}{
 	(*WTaskInfoReq)(nil),               // 0: WTaskInfoReq
 	(*WTaskInfoResp)(nil),              // 1: WTaskInfoResp
@@ -1718,38 +1781,39 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{
 	(*WTaskBattleEventResp)(nil),       // 24: WTaskBattleEventResp
 	(*WTaskEventCompleteReq)(nil),      // 25: WTaskEventCompleteReq
 	(*WTaskEventCompleteResp)(nil),     // 26: WTaskEventCompleteResp
-	nil,                                // 27: WTaskFinishResp.GroupsEntry
+	(*WTaskDailytaskChangePush)(nil),   // 27: WTaskDailytaskChangePush
-	nil,                                // 28: WTaskBoxChangePush.BoxsEntry
+	nil,                                // 28: WTaskFinishResp.GroupsEntry
-	(*DBWTask)(nil),                    // 29: DBWTask
+	nil,                                // 29: WTaskBoxChangePush.BoxsEntry
-	(*DBWTaskItem)(nil),                // 30: DBWTaskItem
+	(*DBWTask)(nil),                    // 30: DBWTask
-	(*UserAtno)(nil),                   // 31: UserAtno
+	(*DBWTaskItem)(nil),                // 31: DBWTaskItem
-	(*BattleFormation)(nil),            // 32: BattleFormation
+	(*UserAtno)(nil),                   // 32: UserAtno
-	(*BattleInfo)(nil),                 // 33: BattleInfo
+	(*BattleFormation)(nil),            // 33: BattleFormation
-	(*BattleReport)(nil),               // 34: BattleReport
+	(*BattleInfo)(nil),                 // 34: BattleInfo
-	(*UserAssets)(nil),                 // 35: UserAssets
+	(*BattleReport)(nil),               // 35: BattleReport
-	(*DBWTaskBox)(nil),                 // 36: DBWTaskBox
+	(*UserAssets)(nil),                 // 36: UserAssets
+	(*DBWTaskBox)(nil),                 // 37: DBWTaskBox
 }
 var file_wtask_wtask_msg_proto_depIdxs = []int32{
-	29, // 0: WTaskInfoResp.info:type_name -> DBWTask
+	30, // 0: WTaskInfoResp.info:type_name -> DBWTask
-	30, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
+	31, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem
-	30, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
+	31, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem
-	30, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
+	31, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem
-	31, // 4: WTaskFinishResp.award:type_name -> UserAtno
+	32, // 4: WTaskFinishResp.award:type_name -> UserAtno
-	27, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
+	28, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry
-	31, // 6: WTaskChapterRewardResp.award:type_name -> UserAtno
+	32, // 6: WTaskChapterRewardResp.award:type_name -> UserAtno
-	30, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
+	31, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
-	32, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation
+	33, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation
-	33, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo
+	34, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo
-	34, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport
+	35, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport
-	35, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets
+	36, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets
-	28, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
+	29, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry
-	31, // 13: WTaskBoxReceiveResp.award:type_name -> UserAtno
+	32, // 13: WTaskBoxReceiveResp.award:type_name -> UserAtno
-	31, // 14: WTaskExchangeResp.award:type_name -> UserAtno
+	32, // 14: WTaskExchangeResp.award:type_name -> UserAtno
-	32, // 15: WTaskBattleEventReq.battle:type_name -> BattleFormation
+	33, // 15: WTaskBattleEventReq.battle:type_name -> BattleFormation
-	33, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo
+	34, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo
-	34, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport
+	35, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport
-	31, // 18: WTaskEventCompleteResp.award:type_name -> UserAtno
+	32, // 18: WTaskEventCompleteResp.award:type_name -> UserAtno
-	36, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
+	37, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox
 	20, // [20:20] is the sub-list for method output_type
 	20, // [20:20] is the sub-list for method input_type
 	20, // [20:20] is the sub-list for extension type_name
@@ -2090,6 +2154,18 @@ func file_wtask_wtask_msg_proto_init() {
 				return nil
 			}
 		}
+		file_wtask_wtask_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WTaskDailytaskChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2097,7 +2173,7 @@ func file_wtask_wtask_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_wtask_wtask_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   29,
+			NumMessages:   30,
 			NumExtensions: 0,
 			NumServices:   0,
 		},