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

bin/json/game_caravancity.json

@@ -16,7 +16,7 @@
       0
     ],
     "citylvlock": 1,
-    "citymainlock": 11001,
+    "citymainlock": 0,
     "cityman": 34006,
     "cityname": {
       "key": "caravan_caravan_city_cityname_1",
@@ -68,7 +68,7 @@
       0
     ],
     "citylvlock": 1,
-    "citymainlock": 11001,
+    "citymainlock": 0,
     "cityman": 24004,
     "cityname": {
       "key": "caravan_caravan_city_cityname_2",
@@ -121,7 +121,7 @@
       0
     ],
     "citylvlock": 1,
-    "citymainlock": 11001,
+    "citymainlock": 0,
     "cityman": 25001,
     "cityname": {
       "key": "caravan_caravan_city_cityname_3",
@@ -174,7 +174,7 @@
       0
     ],
     "citylvlock": 2,
-    "citymainlock": 11001,
+    "citymainlock": 0,
     "cityman": 45001,
     "cityname": {
       "key": "caravan_caravan_city_cityname_4",
@@ -226,7 +226,7 @@
       0
     ],
     "citylvlock": 2,
-    "citymainlock": 11001,
+    "citymainlock": 0,
     "cityman": 14007,
     "cityname": {
       "key": "caravan_caravan_city_cityname_5",

bin/json/game_combatlevel.json

@@ -3,11 +3,11 @@
     "id": 10001,
     "scene": "leveldemo_fcamer_1_1",
     "levelname": "Look For Blast Air",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187001
-      10001,
+    ],
-      10002,
+    "subtask": [
-      10003
+      11187002
     ],
     "award": [
       {
@@ -21,6 +21,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16001001",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_1",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_1"
   },
@@ -28,10 +41,11 @@
     "id": 10002,
     "scene": "leveldemo_fcamer_1_2",
     "levelname": "Rescue Grug",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187003
-      10301,
+    ],
-      10302
+    "subtask": [
+      11187004
     ],
     "award": [
       {
@@ -45,6 +59,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16001002",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_3",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_3"
   },
@@ -52,11 +79,11 @@
     "id": 10003,
     "scene": "leveldemo_fcamer_1_3",
     "levelname": "Repair Broken Books",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187005
-      10101,
+    ],
-      10102,
+    "subtask": [
-      10103
+      11187006
     ],
     "award": [
       {
@@ -70,6 +97,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16001003",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_2",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_2"
   },
@@ -77,11 +117,11 @@
     "id": 10004,
     "scene": "leveldemo_fcamer_1_4",
     "levelname": "Restart The Windmill",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187007
-      10401,
+    ],
-      10402,
+    "subtask": [
-      10403
+      11187008
     ],
     "award": [
       {
@@ -95,6 +135,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16002001",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_4",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_4"
   },
@@ -102,12 +155,12 @@
     "id": 10005,
     "scene": "leveldemo_fcamer_1_5",
     "levelname": "Tame The Rampage Flock",
-    "passformatList": [
+    "maintask": [
-      110213,
+      11187009
-      110214,
+    ],
-      110215
+    "subtask": [
+      11187010
     ],
-    "passdroplist": [],
     "award": [
       {
         "a": "attr",
@@ -120,6 +173,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16002002",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_5",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_5"
   },
@@ -127,10 +193,12 @@
     "id": 10006,
     "scene": "leveldemo_fcamer_1_6",
     "levelname": "Against Eret",
-    "passformatList": [
+    "maintask": [
-      120031
+      11187011
+    ],
+    "subtask": [
+      11187012
     ],
-    "passdroplist": [],
     "award": [
       {
         "a": "attr",
@@ -143,6 +211,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16002003",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_6",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_6"
   },
@@ -150,12 +231,12 @@
     "id": 10007,
     "scene": "leveldemo_fcamer_1_7",
     "levelname": "Repress Eret",
-    "passformatList": [
+    "maintask": [
-      120032,
+      11187013
-      120033,
+    ],
-      120034
+    "subtask": [
+      11187014
     ],
-    "passdroplist": [],
     "award": [
       {
         "a": "attr",
@@ -168,6 +249,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16003001",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_7",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_7"
   },
@@ -175,9 +269,11 @@
     "id": 10008,
     "scene": "leveldemo_fcamer_1_8",
     "levelname": "Save the holy tree",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187015
-      10302
+    ],
+    "subtask": [
+      11187016
     ],
     "award": [
       {
@@ -191,6 +287,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16003002",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_8",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8"
   },
@@ -198,10 +307,11 @@
     "id": 10009,
     "scene": "leveldemo_fcamer_1_9",
     "levelname": "Save the holy tree",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187017
-      10301,
+    ],
-      10302
+    "subtask": [
+      11187018
     ],
     "award": [
       {
@@ -215,6 +325,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "16003003",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_9",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9"
   },
@@ -222,10 +345,11 @@
     "id": 10010,
     "scene": "leveldemo_fcamer_1_10",
     "levelname": "Save the holy tree",
-    "passformatList": [],
+    "maintask": [
-    "passdroplist": [
+      11187019
-      10301,
+    ],
-      10302
+    "subtask": [
+      11187020
     ],
     "award": [
       {
@@ -239,6 +363,19 @@
         "n": 1
       }
     ],
+    "profectaward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 500
+      },
+      {
+        "a": "item",
+        "t": "30001",
+        "n": 1
+      }
+    ],
+    "debrisitemid": "",
     "scenemusic": "scenemusic_leveldemo_fcamer_1_10",
     "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10"
   }

bin/json/game_combatmanster.json

@@ -227,6 +227,11 @@
         "a": "attr",
         "t": "gold",
         "n": 1650
+      },
+      {
+        "a": "item",
+        "t": "16001001",
+        "n": 4
       }
     ]
   },

bin/json/game_drop.json

@@ -202,8 +202,8 @@
     "prize": [
       {
         "a": "item",
-        "t": "90001",
+        "t": "16001001",
-        "n": 1
+        "n": 4
       }
     ],
     "star": 1,

bin/json/game_linestorymaintask.json

@@ -14,7 +14,9 @@
       "key": "linestory_maintask_describe_1",
       "text": "让阿宝变强1"
     },
-    "img": "zx_pt_01"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 2,
@@ -31,7 +33,9 @@
       "key": "linestory_maintask_describe_2",
       "text": "让阿宝变强2"
     },
-    "img": "zx_pt_02"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 3,
@@ -48,7 +52,9 @@
       "key": "linestory_maintask_describe_3",
       "text": "让阿宝变强3"
     },
-    "img": "zx_pt_03"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 4,
@@ -65,7 +71,9 @@
       "key": "linestory_maintask_describe_4",
       "text": "让阿宝变强4"
     },
-    "img": "zx_pt_04"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 5,
@@ -82,7 +90,9 @@
       "key": "linestory_maintask_describe_5",
       "text": "让阿宝变强6"
     },
-    "img": "zx_pt_06"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 6,
@@ -99,7 +109,9 @@
       "key": "linestory_maintask_describe_6",
       "text": "让阿宝变强5"
     },
-    "img": "zx_pt_05"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 7,
@@ -116,7 +128,9 @@
       "key": "linestory_maintask_describe_7",
       "text": "让阿宝变强7"
     },
-    "img": "zx_pt_07"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 8,
@@ -133,7 +147,9 @@
       "key": "linestory_maintask_describe_8",
       "text": "让阿宝变强8"
     },
-    "img": "zx_pt_08"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   },
   {
     "Id": 9,
@@ -150,6 +166,8 @@
       "key": "linestory_maintask_describe_9",
       "text": "让阿宝变强9"
     },
-    "img": "zx_pt_01"
+    "mainstoryid": "9010",
+    "substoryid": "9010",
+    "img": "jsg_zj_pt01"
   }
 ]

bin/json/game_linestorytimeline.json

@@ -8,7 +8,7 @@
       "key": "linestory_timeline_name_1",
       "text": "阿宝的成长1"
     },
-    "img": "zx_pt_01",
+    "img": "jsg_iprk_1",
     "reward": [
       {
         "a": "attr",
@@ -33,7 +33,7 @@
       "key": "linestory_timeline_name_2",
       "text": "阿宝的成长2"
     },
-    "img": "zx_pt_02",
+    "img": "jsg_iprk_2",
     "reward": [
       {
         "a": "attr",
@@ -58,7 +58,7 @@
       "key": "linestory_timeline_name_3",
       "text": "阿宝的成长3"
     },
-    "img": "zx_pt_03",
+    "img": "jsg_iprk_3",
     "reward": [
       {
         "a": "attr",
@@ -83,7 +83,7 @@
       "key": "linestory_timeline_name_4",
       "text": "阿宝的成长4"
     },
-    "img": "zx_pt_04",
+    "img": "jsg_iprk_4",
     "reward": [
       {
         "a": "attr",
@@ -108,7 +108,7 @@
       "key": "linestory_timeline_name_5",
       "text": "阿宝的成长5"
     },
-    "img": "zx_pt_05",
+    "img": "jsg_iprk_5",
     "reward": [
       {
         "a": "attr",
@@ -133,7 +133,7 @@
       "key": "linestory_timeline_name_6",
       "text": "阿宝的成长6"
     },
-    "img": "zx_pt_06",
+    "img": "jsg_iprk_6",
     "reward": [
       {
         "a": "attr",
@@ -158,7 +158,7 @@
       "key": "linestory_timeline_name_7",
       "text": "阿宝的成长7"
     },
-    "img": "zx_pt_07",
+    "img": "jsg_iprk_7",
     "reward": [
       {
         "a": "attr",
@@ -183,7 +183,7 @@
       "key": "linestory_timeline_name_8",
       "text": "阿宝的成长8"
     },
-    "img": "zx_pt_08",
+    "img": "jsg_iprk_8",
     "reward": [
       {
         "a": "attr",

bin/json/game_skillpassive.json

@@ -501,7 +501,7 @@
     "Id": 424002211,
     "When": 16,
     "FromCheck": "Target=3",
-    "TargetCheck": "",
+    "TargetCheck": "Hasbuff=390001211",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -516,13 +516,13 @@
   {
     "Id": 424002212,
     "When": 16,
-    "FromCheck": "",
+    "FromCheck": "Hasbuff=390001211",
     "TargetCheck": "Target=3",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
     "AddCon": [],
-    "PasPr": 1000,
+    "PasPr": 500,
     "Type": "BeatBack",
     "MaxEmitTimes": 1,
     "Callback": []
@@ -1416,9 +1416,9 @@
   },
   {
     "Id": 455004211,
-    "When": 3,
+    "When": 15,
-    "FromCheck": "Target=3,HasBuff=39000140",
+    "FromCheck": "Target=1",
-    "TargetCheck": "2",
+    "TargetCheck": "Target=2",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -1426,7 +1426,9 @@
     "PasPr": 1000,
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
-    "Callback": []
+    "Callback": [
+      255004212
+    ]
   },
   {
     "Id": 445004211,
@@ -1476,9 +1478,9 @@
   },
   {
     "Id": 455003211,
-    "When": 2,
+    "When": 15,
-    "FromCheck": "Target=3,HasBuff=390001129",
+    "FromCheck": "Target=1",
-    "TargetCheck": "2",
+    "TargetCheck": "Target=2",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -1487,8 +1489,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
     "Callback": [
-      255003212,
+      255003212
-      255003213
     ]
   },
   {
@@ -1557,7 +1558,7 @@
   },
   {
     "Id": 455006311,
-    "When": 12,
+    "When": 16,
     "FromCheck": "Target=2",
     "TargetCheck": "Target=3",
     "MainSkillCheck": "",
@@ -1569,14 +1570,28 @@
     "MaxEmitTimes": 1,
     "Callback": [
       255006312,
-      255006313
+      255006314
     ]
   },
   {
-    "Id": 455006314,
+    "Id": 455006312,
-    "When": 12,
+    "When": 16,
     "FromCheck": "Target=2",
-    "TargetCheck": "Target=3,HasBuff=390001413,OverlayNum=5",
+    "TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=8",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "Type": "CallSkillPas",
+    "MaxEmitTimes": 1,
+    "Callback": []
+  },
+  {
+    "Id": 455006314,
+    "When": 16,
+    "FromCheck": "Target=2",
+    "TargetCheck": "Target=3,HasBuff=390001413,OverlayNum=8",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -1585,7 +1600,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
     "Callback": [
-      155006211
+      155006312
     ]
   },
   {
@@ -1712,8 +1727,8 @@
   {
     "Id": 455006214,
     "When": 12,
-    "FromCheck": "Target=3",
+    "FromCheck": "Target=2",
-    "TargetCheck": "Target=2",
+    "TargetCheck": "Target=3",
     "MainSkillCheck": "",
     "AfterSkillCheck": "SkillID=255006213",
     "BuffCheck": "",
@@ -1723,14 +1738,14 @@
     "MaxEmitTimes": 1,
     "Callback": [
       390001401,
-      10
+      8
     ]
   },
   {
     "Id": 455002211,
-    "When": 21,
+    "When": 15,
-    "FromCheck": "Target=3",
+    "FromCheck": "Target=2",
-    "TargetCheck": "",
+    "TargetCheck": "Target=1",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",
@@ -1739,7 +1754,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
     "Callback": [
-      255002212
+      255002213
     ]
   },
   {
@@ -2415,5 +2430,55 @@
     "Callback": [
       251017113
     ]
+  },
+  {
+    "Id": 455005214,
+    "When": 21,
+    "FromCheck": "Target=0",
+    "TargetCheck": "",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "Type": "CallSkillPas",
+    "MaxEmitTimes": 1,
+    "Callback": [
+      255005214
+    ]
+  },
+  {
+    "Id": 455002213,
+    "When": 2,
+    "FromCheck": "",
+    "TargetCheck": "Target=3",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "AddCon": [
+      "Hpproless=300"
+    ],
+    "PasPr": 1000,
+    "Type": "CallSkillPas",
+    "MaxEmitTimes": 1,
+    "Callback": [
+      255002213
+    ]
+  },
+  {
+    "Id": 455001211,
+    "When": 15,
+    "FromCheck": "Target=1",
+    "TargetCheck": "Target=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "Type": "CallSkillPas",
+    "MaxEmitTimes": 1,
+    "Callback": [
+      255001212
+    ]
   }
 ]

comm/const.go

@@ -87,6 +87,7 @@ const (
 	ModuleReputation  core.M_Modules = "reputation"  //阵营声望
 	ModuleOldtimes    core.M_Modules = "oldtimes"    //旧时光
 	ModuleCaravan     core.M_Modules = "caravan"     //巨怪商队
+	ModuleBuried      core.M_Modules = "buried"      //埋点中心
 )
 
 // 数据表名定义处
@@ -260,6 +261,9 @@ const (
 	TableOldtimes = "oldtimes"
 	// 巨怪商队
 	TableCaravan = "caravan"
+
+	//埋点数据统计
+	TableBuried = "buried"
 )
 
 // RPC服务接口定义处
@@ -628,7 +632,7 @@ const (
 	Rtype152 TaskType = 152 //熊猫武馆解锁柱子
 	Rtype153 TaskType = 153 //商队交易x次
 	Rtype154 TaskType = 154 //狩猎副本掉落x个觉醒材料
-	Rtype155 TaskType = 155 //调整助战英雄n次
+
 	Rtype156 TaskType = 156 //完成工会任务n次
 	Rtype157 TaskType = 157 //战斗在xx系统中完成xx事件
 	Rtype158 TaskType = 158 //主线第X章关卡总星数达到N星

modules/arena/modelarena.go

@@ -92,7 +92,7 @@ func (this *modelArena) queryUserHeros(uid string, heroids []string) (results []
 	var (
 		model *db.DBModel
 	)
-	if model, err = this.module.GetDBModelByUid(uid, comm.TableHero, time.Hour); err != nil {
+	if model, err = this.module.GetDBModelByUid(uid, comm.TableHero); err != nil {
 		this.module.Errorln(err)
 		return
 	}

modules/atlas/module.go

@@ -53,7 +53,7 @@ func (this *PandaAtlas) CheckActivatePandaAtlasCollect(uid string, id string) {
 	}
 	if this.IsCross() {
 		atlas := &pb.DBPandaAtlas{}
-		if model, err := this.GetDBModelByUid(uid, this.modelPandaAtlas.TableName, this.modelPandaAtlas.Expired); err == nil {
+		if model, err := this.GetDBModelByUid(uid, this.modelPandaAtlas.TableName); err == nil {
 
 			if err := model.Get(uid, atlas); err != nil { // 防止数据没有初始化情况
 				if mongo.ErrNoDocuments == err {

modules/battle/module.go

@@ -209,11 +209,11 @@ func (this *Battle) CreateRtPvpBattle(req *pb.BattleRTPVPReq) (code pb.ErrorCode
 		code = pb.ErrorCode_Exception
 		return
 	}
-	if redmodel, err = this.GetDBModelByUid(req.RedCompId, comm.TableHero, time.Hour); err != nil {
+	if redmodel, err = this.GetDBModelByUid(req.RedCompId, comm.TableHero); err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}
-	if bluemodel, err = this.GetDBModelByUid(req.BlueCompId, comm.TableHero, time.Hour); err != nil {
+	if bluemodel, err = this.GetDBModelByUid(req.BlueCompId, comm.TableHero); err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}

modules/buried/configure.go

@@ -0,0 +1,66 @@
+package buried
+
+import (
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/sys/configure"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"sync"
+)
+
+const (
+	gameTaskCond = "game_rdtaskcondi.json"
+)
+
+//配置管理组件
+type configureComp struct {
+	modules.MCompConfigure
+	module *Buried
+	lock   sync.RWMutex
+	group  map[comm.TaskType][]*cfg.GameRdtaskCondiData //安排点类型 分组
+}
+
+//组件初始化接口
+func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.MCompConfigure.Init(service, module, comp, options)
+	this.module = module.(*Buried)
+	this.LoadConfigure(gameTaskCond, cfg.NewGameRdtaskCondi)
+	configure.RegisterConfigure(gameTaskCond, cfg.NewGameRdtaskCondi, this.updateconfigure)
+	return
+}
+
+//动态更新配置
+func (this *configureComp) updateconfigure() {
+	if v, err := this.GetConfigure(gameTaskCond); err != nil {
+		return
+	} else {
+		if data, ok := v.(*cfg.GameRdtaskCondi); !ok {
+			err = fmt.Errorf("%T  is *cfg.GameRdtaskCondi", v)
+			return
+		} else {
+			group := map[comm.TaskType][]*cfg.GameRdtaskCondiData{}
+			for _, v := range data.GetDataList() {
+				if _, ok = group[comm.TaskType(v.Type)]; !ok {
+					group[comm.TaskType(v.Type)] = make([]*cfg.GameRdtaskCondiData, 0)
+				}
+				group[comm.TaskType(v.Type)] = append(group[comm.TaskType(v.Type)], v)
+			}
+			this.lock.Lock()
+			this.group = group
+			this.lock.Unlock()
+		}
+	}
+}
+
+//读取埋点条件配置
+func (this *configureComp) getCondiDatas(tt comm.TaskType) (result []*cfg.GameRdtaskCondiData) {
+	result = make([]*cfg.GameRdtaskCondiData, 0)
+	this.lock.RLock()
+	if _, ok := this.group[tt]; ok {
+		result = this.group[tt]
+	}
+	this.lock.RUnlock()
+	return
+}

modules/buried/core.go

@@ -0,0 +1,19 @@
+package buried
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//判断埋点数据的有效性
+func checkburied(buried *comm.TaskParam, conf *cfg.GameRdtaskCondiData) (efficient bool) {
+
+	return false
+}
+
+//更新埋点数据
+func updateburied(buried *comm.TaskParam, conf *cfg.GameRdtaskCondiData, data *pb.DBBuriedItem) (err error) {
+	
+	return
+}

modules/buried/modelburied.go

@@ -0,0 +1,42 @@
+package buried
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+	"go_dreamfactory/sys/db"
+
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/x/bsonx"
+)
+
+type modelBuried struct {
+	modules.MCompModel
+	module *Buried
+}
+
+func (this *modelBuried) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.TableName = string(comm.TableBuried)
+	err = this.MCompModel.Init(service, module, comp, options)
+	this.module = module.(*Buried)
+	// uid 创建索引
+	this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
+		Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
+	})
+	return
+}
+
+//更新埋点数据到db中
+func (this *modelBuried) getburiedModel(uid string) (model *buriedModel, err error) {
+	if db.IsCross() {
+		this.module.GetDBModelByUid(uid, this.TableName)
+	} else {
+
+	}
+	return
+}
+
+//埋点专属模型 会封装特殊的数据转换接口
+type buriedModel struct {
+	db.DBModel
+}

modules/buried/module.go

@@ -0,0 +1,60 @@
+package buried
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/base"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+)
+
+/*
+模块名:用户埋点完成条件触发系统
+模块描述:用户埋点数据中心管理模块
+开发人员:李伟
+*/
+
+type Buried struct {
+	modules.ModuleBase
+	service     base.IRPCXService
+	configure   *configureComp
+	modelBuried *modelBuried
+}
+
+func NewModule() core.IModule {
+	return &Buried{}
+}
+
+func (this *Buried) GetType() core.M_Modules {
+	return comm.ModuleBuried
+}
+
+func (this *Buried) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+	err = this.ModuleBase.Init(service, module, options)
+	this.service = service.(base.IRPCXService)
+	return
+}
+
+func (this *Buried) Start() (err error) {
+	err = this.ModuleBase.Start()
+	return
+}
+
+//装备组件
+func (this *Buried) OnInstallComp() {
+	this.ModuleBase.OnInstallComp()
+
+	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
+	this.modelBuried = this.RegisterComp(new(modelBuried)).(*modelBuried)
+}
+
+//触发埋点
+func (this *Buried) TriggerBuried(uid string, taskParams ...*comm.TaskParam) {
+	for _, buried := range taskParams {
+		conds := this.configure.getCondiDatas(buried.TT)
+		for _, cond := range conds {
+			if checkburied(buried, cond) { //判断此埋点数据是否有效
+				
+			}
+		}
+	}
+}

modules/combat/api_askpass.go

@@ -0,0 +1,86 @@
+package combat
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//参数校验
+func (this *apiComp) AskPassCheck(session comm.IUserSession, req *pb.CombatAskPassReq) (code pb.ErrorCode) {
+
+	return
+}
+
+///询问管卡是否通关
+func (this *apiComp) AskPass(session comm.IUserSession, req *pb.CombatAskPassReq) (code pb.ErrorCode, data *pb.ErrorData) {
+	var (
+		info    *pb.DBCombatUser
+		level   *pb.DBCombatLevel
+		lvconf  *cfg.GameCombatLevelData
+		resp    *pb.CombatAskPassResp = &pb.CombatAskPassResp{Level: req.Level}
+		mtaskid []int32
+		staskid []int32
+		ok      bool
+		err     error
+	)
+	if code = this.AskPassCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+	if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil {
+		code = pb.ErrorCode_ConfigNoFound
+		return
+	}
+	if info, err = this.module.modelCombat.queryInfo(session.GetUserId()); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	if level, ok = info.Level[req.Level]; !ok {
+		code = pb.ErrorCode_ReqParameterError
+		this.module.Errorf("no in Level:%s", req.Level)
+		return
+	}
+
+	if level.Pass == 0 { //查询通关进度
+		mtaskid = this.module.ModuleRtask.CheckCondis(session.GetUserId(), lvconf.Maintask...)
+		if mtaskid != nil && len(mtaskid) == len(lvconf.Maintask) { //全部完成
+			this.module.DispenseRes(session, lvconf.Award, true)
+			atns := make([]*pb.UserAssets, len(lvconf.Award))
+			for i, v := range lvconf.Award {
+				atns[i] = &pb.UserAssets{
+					A: v.A,
+					T: v.T,
+					N: v.N,
+				}
+			}
+			resp.Passmaintask = mtaskid
+			resp.Mainaward = atns
+			level.Pass = 1
+
+		}
+	}
+
+	if level.Pass == 1 {
+		staskid = this.module.ModuleRtask.CheckCondis(session.GetUserId(), lvconf.Subtask...)
+		if len(staskid) == len(lvconf.Subtask) { //全部完成
+			this.module.DispenseRes(session, lvconf.Profectaward, true)
+			atns := make([]*pb.UserAssets, len(lvconf.Profectaward))
+			for i, v := range lvconf.Profectaward {
+				atns[i] = &pb.UserAssets{
+					A: v.A,
+					T: v.T,
+					N: v.N,
+				}
+			}
+			resp.Passpertask = staskid
+			resp.Peraward = atns
+			level.Pass = 2
+		}
+	}
+	if err = this.module.modelCombat.updateInfo(info); err != nil {
+		code = pb.ErrorCode_DBError
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "askpass", resp)
+	return
+}

modules/combat/api_challengereceive.go

@@ -18,11 +18,12 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
 		iswin   bool
 		info    *pb.DBCombatUser
 		lv      *pb.DBCombatLevel
-		level   *cfg.GameCombatLevelData
+		lvconf  *cfg.GameCombatLevelData
 		manster *cfg.GameCombatMansterData
-		pass    bool
+		// pass    bool
-		ok      bool
+		atns []*pb.UserAssets
-		err     error
+		ok   bool
+		err  error
 	)
 	if code = this.ChallengeReceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
@@ -40,7 +41,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
 			this.module.Errorf("no in Level:%s", req.Level)
 			return
 		}
-		if level, err = this.module.configure.getCombatLevel(req.Level); err != nil {
+		if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil {
 			code = pb.ErrorCode_ConfigNoFound
 			return
 		}
@@ -62,44 +63,22 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
 		}
 
 		this.module.DispenseRes(session, manster.Award, true)
-		pass = true
+		atns = make([]*pb.UserAssets, len(manster.Award))
-		for _, v := range level.Passdroplist {
+		for i, v := range manster.Award {
-			ispass := false
+			atns[i] = &pb.UserAssets{
-			for _, v1 := range lv.Passdrop {
+				A: v.A,
-				if v == v1 {
+				T: v.T,
-					ispass = true
+				N: v.N,
-				}
-			}
-			if !ispass {
-				pass = false
-				break
 			}
 		}
-		for _, v := range level.PassformatList {
+		lv.Progress = int32(this.module.ModuleItems.QueryItemAmount(session.GetUserId(), lvconf.Debrisitemid))
-			ispass := false
-			for _, v1 := range lv.Passmanster {
-				if v == v1 {
-					ispass = true
-				}
-			}
-			if !ispass {
-				pass = false
-				break
-			}
-		}
-		if pass {
-			lv.Pass = true
-			this.module.DispenseRes(session, level.Award, true)
-			// this.module.ModuleRtask.SendToRtask(session, comm.Rtype140, 1, level.Id)
-			go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype140, 1))
-		}
-		lv.Progress = int32((float64(len(lv.Passmanster)+len(lv.Passdrop)) / float64(len(level.Passdroplist)+len(level.PassformatList))) * float64(100))
 		if err = this.module.modelCombat.updateInfo(info); err != nil {
 			code = pb.ErrorCode_DBError
 			return
 		}
+
 	}
 
-	session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Issucc: true, Pass: pass})
+	session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Issucc: true, Level: req.Level, Manster: req.Manster, Atns: atns, Progress: lv.Progress})
 	return
 }

modules/combat/api_drop.go

@@ -15,13 +15,13 @@ func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq)
 ///奖励领取
 func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
-		info  *pb.DBCombatUser
+		info   *pb.DBCombatUser
-		lv    *pb.DBCombatLevel
+		lv     *pb.DBCombatLevel
-		level *cfg.GameCombatLevelData
+		lvconf *cfg.GameCombatLevelData
-		box   *cfg.GameCombatBoxData
+		box    *cfg.GameCombatBoxData
-		atns  []*pb.UserAssets
+		atns   []*pb.UserAssets
-		ok    bool
+		ok     bool
-		err   error
+		err    error
 	)
 	if code = this.DropCheck(session, req); code != pb.ErrorCode_Success {
 		return
@@ -37,7 +37,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
 		return
 	}
 
-	if level, err = this.module.configure.getCombatLevel(req.Level); err != nil {
+	if lvconf, err = this.module.configure.getCombatLevel(req.Level); err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}
@@ -69,44 +69,11 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
 			N: v.N,
 		}
 	}
-
+	lv.Progress = int32(this.module.ModuleItems.QueryItemAmount(session.GetUserId(), lvconf.Debrisitemid))
-	pass := true
-	for _, v := range level.Passdroplist {
-		ispass := false
-		for _, v1 := range lv.Passdrop {
-			if v == v1 {
-				ispass = true
-			}
-		}
-		if !ispass {
-			pass = false
-			break
-		}
-	}
-	for _, v := range level.PassformatList {
-		ispass := false
-		for _, v1 := range lv.Passmanster {
-			if v == v1 {
-				ispass = true
-			}
-		}
-		if !ispass {
-			pass = false
-			break
-		}
-	}
-
-	if pass {
-		lv.Pass = true
-		this.module.DispenseRes(session, level.Award, true)
-		// this.module.ModuleRtask.SendToRtask(session, comm.Rtype140, 1, level.Id)
-		go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype140, 1))
-	}
-	lv.Progress = int32((float64(len(lv.Passmanster)+len(lv.Passdrop)) / float64(len(level.Passdroplist)+len(level.PassformatList))) * float64(100))
 	if err = this.module.modelCombat.updateInfo(info); err != nil {
 		code = pb.ErrorCode_DBError
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Code: code, Atns: atns, Pass: pass})
+	session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Code: code, Atns: atns, Progress: lv.Progress})
 	return
 }

modules/combat/module.go

@@ -72,7 +72,7 @@ func (this *Combat) GetLevelStatus(uid string, levelId int32) bool {
 
 	if combat != nil {
 		if v, ok := combat.Level[levelId]; ok {
-			return v.Pass
+			return v.Pass == 1
 		}
 	}
 	return false

modules/equipment/modelEquipment.go

@@ -57,7 +57,7 @@ func (this *modelEquipmentComp) QueryUserEquipments(uId string) (equipments []*p
 	)
 	equipments = make([]*pb.DB_Equipment, 0)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.GetList(uId, &equipments); err != nil {
@@ -143,7 +143,7 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
 			model *db.DBModel
 		)
 		if this.module.IsCross() {
-			if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+			if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 				this.module.Errorln(err)
 			} else {
 				if err = model.AddLists(uId, add); err != nil {
@@ -166,7 +166,7 @@ func (this *modelEquipmentComp) addEquipment(equip *pb.DB_Equipment) (err error)
 		model *db.DBModel
 	)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(equip.UId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(equip.UId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.AddList(equip.UId, equip.Id, equip); err != nil {
@@ -190,7 +190,7 @@ func (this *modelEquipmentComp) DelEquipments(uId string, eIds []string) (change
 	)
 	change = make([]*pb.DB_Equipment, 0)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.DelListlds(uId, eIds); err != nil {
@@ -220,7 +220,7 @@ func (this *modelEquipmentComp) UpdateByHeroId(uid string, equipments ...*pb.DB_
 		model *db.DBModel
 	)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			for _, v := range equipments {
@@ -309,7 +309,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
 		}
 	}
 	if satterNum > int32(len(sattr)) {
-		satterNum = int32(len(sattr)) 
+		satterNum = int32(len(sattr))
 	}
 
 	if satterNum > 0 && satterNum <= 4 {

modules/hero/model_hero.go

@@ -140,7 +140,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
 	if hero != nil {
 		hero.SameCount = 1 // 新需求 不需要判断叠加
 		if this.moduleHero.IsCross() {
-			if model, err = this.moduleHero.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+			if model, err = this.moduleHero.GetDBModelByUid(uid, this.TableName); err != nil {
 				this.moduleHero.Errorln(err)
 			} else {
 				if err = model.AddList(uid, hero.Id, hero); err != nil {
@@ -851,7 +851,7 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c
 		return
 	}
 	if this.moduleHero.IsCross() {
-		if dbModel, err1 := this.moduleHero.GetDBModelByUid(uid, this.TableName, this.Expired); err1 == nil {
+		if dbModel, err1 := this.moduleHero.GetDBModelByUid(uid, this.TableName); err1 == nil {
 			if err = dbModel.GetList(uid, &heros); err != nil {
 				this.moduleHero.Errorf("err:%v", err)
 				return

modules/hero/module.go

@@ -309,7 +309,7 @@ func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp in
 	}
 	if this.IsCross() {
 		_hero = &pb.DBHero{}
-		if model, err := this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName, this.modelHero.Expired); err == nil {
+		if model, err := this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName); err == nil {
 			if err := model.GetListObj(session.GetUserId(), heroObjID, _hero); err != nil {
 				this.Errorf("err:%v", err)
 				return
@@ -347,7 +347,7 @@ func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongf
 
 	if this.IsCross() {
 		_hero = &pb.DBHero{}
-		if model, err = this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName, this.modelHero.Expired); err == nil {
+		if model, err = this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName); err == nil {
 			if err := model.GetListObj(session.GetUserId(), heroObjID, _hero); err != nil {
 				this.Errorf("err:%v", err)
 				return
@@ -850,7 +850,7 @@ func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid []string
 	)
 
 	if this.IsCross() {
-		if model, err = this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName, this.modelHero.Expired); err == nil {
+		if model, err = this.GetDBModelByUid(session.GetUserId(), this.modelHero.TableName); err == nil {
 			for _, v := range heroOid {
 				_hero := &pb.DBHero{}
 				if err := model.GetListObj(session.GetUserId(), v, _hero); err != nil {

modules/horoscope/modelhoroscope.go

@@ -9,7 +9,6 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/sys/db"
 	"math"
-	"time"
 )
 
 ///星座图 数据组件
@@ -51,7 +50,7 @@ func (this *modelHoroscope) updateInfo(session comm.IUserSession, info *pb.DBHor
 		"nodes":    info.Nodes,
 		"lastrest": info.Lastrest,
 	})
-	if model, err = this.module.GetDBModelByUid(info.Uid, this.TableName, time.Hour); err != nil {
+	if model, err = this.module.GetDBModelByUid(info.Uid, this.TableName); err != nil {
 		this.module.Errorln(err)
 		return
 	}

modules/items/modelitems.go

@@ -43,7 +43,7 @@ func (this *ModelItemsComp) QueryUserPack(uId string) (itmes []*pb.DB_UserItemDa
 	)
 	itmes = make([]*pb.DB_UserItemData, 0)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.GetList(uId, &itmes); err != nil {
@@ -67,7 +67,7 @@ func (this *ModelItemsComp) QueryUserPackByGridId(uId string, grid string) (itme
 
 	itme = &pb.DB_UserItemData{}
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.GetListObj(uId, grid, itme); err != nil {
@@ -91,7 +91,7 @@ func (this *ModelItemsComp) QueryUserPackByGridIds(uId string, grids []string) (
 
 	itme = make([]*pb.DB_UserItemData, len(grids))
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.GetListObjs(uId, grids, &itme); err != nil {
@@ -117,7 +117,7 @@ func (this *ModelItemsComp) AddUserPack(uId string, itmes ...*pb.DB_UserItemData
 		model *db.DBModel
 	)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.AddLists(uId, data); err != nil {
@@ -139,7 +139,7 @@ func (this *ModelItemsComp) UpdateUserPack(uid string, itmes ...*pb.DB_UserItemD
 		model *db.DBModel
 	)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			for _, v := range itmes {
@@ -173,7 +173,7 @@ func (this *ModelItemsComp) DeleteUserPack(uid string, itmes ...*pb.DB_UserItemD
 		gridIds[i] = v.GridId
 	}
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.DelListlds(uid, gridIds); err != nil {

modules/items/module.go

@@ -5,6 +5,7 @@ import (
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
+	"go_dreamfactory/utils"
 
 	"go_dreamfactory/lego/base"
 	"go_dreamfactory/lego/core"
@@ -136,7 +137,8 @@ func (this *Items) AddItem(session comm.IUserSession, itemid string, addnum int3
 ///添加多个物品到背包 (可以加物品和减物品)
 func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, bPush bool) (change []*pb.DB_UserItemData, code pb.ErrorCode) {
 	var (
-		err error
+		tasks []*comm.TaskParam = make([]*comm.TaskParam, 0)
+		err   error
 	)
 
 	defer this.Debugf("给用户添加物品 uId:%s items:%v items:%v", session.GetUserId(), items, err == nil)
@@ -156,6 +158,12 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b
 	if len(change) > 0 && bPush {
 		this.itemsChangePush(session, change) //推送道具背包变化
 	}
+	for k, v := range items {
+		tasks = append(tasks, comm.GettaskParam(comm.Rtype187, utils.ToInt32(k), v))
+	}
+	if len(tasks) > 0 {
+		go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...)
+	}
 	return
 }
 

modules/modulebase.go

@@ -521,7 +521,7 @@ func (this *ModuleBase) GetCrossDBModel(tableName string, expired time.Duration)
 }
 
 // 跨服对象获取数据操作对象
-func (this *ModuleBase) GetDBModelByUid(uid, tableName string, expired time.Duration) (model *db.DBModel, err error) {
+func (this *ModuleBase) GetDBModelByUid(uid, tableName string) (model *db.DBModel, err error) {
 	var (
 		stag string
 		conn *db.DBConn
@@ -538,7 +538,7 @@ func (this *ModuleBase) GetDBModelByUid(uid, tableName string, expired time.Dura
 			return
 		}
 	}
-	model = db.NewDBModel(tableName, expired, conn)
+	model = db.NewDBModel(tableName, time.Hour, conn)
 	return
 }
 

modules/parkour/model_mounts.go

@@ -36,7 +36,7 @@ func (this *ModelMountsComp) QueryUserPack(uId string) (itmes []*pb.DB_UserItemD
 	)
 	itmes = make([]*pb.DB_UserItemData, 0)
 	if this.module.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uId, this.TableName, this.Expired); err != nil {
+		if model, err = this.module.GetDBModelByUid(uId, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.GetList(uId, &itmes); err != nil {

modules/privilege/module.go

@@ -9,7 +9,6 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	"go_dreamfactory/utils"
-	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
@@ -413,7 +412,7 @@ func (this *Privilege) SendDailyPrivilegeMail(session comm.IUserSession, cId []i
 }
 func (this *Privilege) GetCountByPrivilegeId(uid string, pType int32) (count int32) {
 	if this.IsCross() { // 跨服情况
-		if model, err := this.GetDBModelByUid(uid, comm.TableVip, time.Hour); err == nil {
+		if model, err := this.GetDBModelByUid(uid, comm.TableVip); err == nil {
 			vip := &pb.DBVip{}
 			if err = model.Get(uid, vip); err == nil {
 				if v, ok := vip.Privilege[pType]; ok {

modules/rtask/api_tasktest.go

@@ -17,7 +17,6 @@ func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (cod
 	if req.CondiId != 0 {
 		if code = this.moduleRtask.CheckCondi(session.GetUserId(), req.CondiId); code != pb.ErrorCode_Success {
 			rsp.Flag = false
-			return
 		}
 	} else if req.GroupId != 0 {
 		// 获取当前玩家

modules/rtask/module.go

@@ -24,13 +24,14 @@ var _ comm.IRtask = (*ModuleRtask)(nil)
 
 // 限定条件
 type rtaskCondHandle struct {
-	condId int32        //任务条件配置ID
+	condId int32            //任务条件配置ID
-	verify verifyHandle //校验任务条件
+	verify verifyHandle     //校验任务条件
 	update updateDataHandle //更新任务数据
 }
 
 // 任务参数校验
 type verifyHandle func(uid string, record *pb.DBRtaskRecord, cfg *cfg.GameRdtaskCondiData) (bool, error)
+
 // 任务数据更新
 type updateDataHandle func(uid string, record *pb.DBRtaskRecord, cfg *cfg.GameRdtaskCondiData, vals ...int32) error
 
@@ -90,7 +91,6 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtask.verifyRtype3,
-				update: this.modelRtaskRecord.overrideUpdate,
 			}
 			handles = append(handles, handle)
 			this.registerVerifyHandle(v.Id, handle)
@@ -106,28 +106,26 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtask.verfiyRtype9,
-				update: this.modelRtaskRecord.overrideUpdate,
-			}
-			handles = append(handles, handle)
-			this.registerVerifyHandle(v.Id, handle)
-		case comm.Rtype18:
-			handle := &rtaskCondHandle{
-				condId: v.Id,
-				verify: this.modelRtaskRecord.verifyFirstGreatEqualParam,
-				update: this.modelRtaskRecord.addUpdate,
 			}
 			handles = append(handles, handle)
 			this.registerVerifyHandle(v.Id, handle)
+
 		case comm.Rtype7, comm.Rtype12, comm.Rtype13, comm.Rtype14, comm.Rtype15,
-			comm.Rtype19, comm.Rtype21, comm.Rtype24,
+			comm.Rtype18, comm.Rtype19, comm.Rtype24,
 			comm.Rtype26, comm.Rtype27, comm.Rtype28, comm.Rtype38,
 			comm.Rtype39, comm.Rtype51, comm.Rtype53,
 			comm.Rtype54, comm.Rtype57, comm.Rtype60,
-			comm.Rtype62, comm.Rtype64, comm.Rtype88, comm.Rtype104,
+			comm.Rtype62, comm.Rtype64, comm.Rtype87, comm.Rtype88, comm.Rtype89, comm.Rtype90,
-			comm.Rtype96, comm.Rtype105, comm.Rtype128, comm.Rtype130, comm.Rtype131,
+			comm.Rtype91, comm.Rtype92, comm.Rtype94, comm.Rtype95, comm.Rtype97, comm.Rtype104,
+			comm.Rtype96, comm.Rtype98, comm.Rtype99, comm.Rtype102, comm.Rtype103, comm.Rtype105,
+			comm.Rtype106, comm.Rtype108, comm.Rtype113, comm.Rtype114, comm.Rtype115, comm.Rtype116,
+			comm.Rtype117, comm.Rtype118, comm.Rtype119, comm.Rtype120, comm.Rtype121, comm.Rtype123,
+			comm.Rtype128, comm.Rtype130, comm.Rtype131, comm.Rtype132, comm.Rtype135,
 			comm.Rtype141, comm.Rtype142, comm.Rtype143, comm.Rtype144, comm.Rtype145, comm.Rtype146,
-			comm.Rtype147, comm.Rtype149, comm.Rtype153, comm.Rtype154, comm.Rtype155, comm.Rtype156,
+			comm.Rtype147, comm.Rtype148, comm.Rtype149, comm.Rtype152, comm.Rtype153, comm.Rtype154,
-			comm.Rtype171, comm.Rtype186, comm.Rtype187:
+			comm.Rtype156, comm.Rtype161, comm.Rtype165, comm.Rtype166, comm.Rtype167,
+			comm.Rtype171, comm.Rtype172, comm.Rtype173, comm.Rtype175, comm.Rtype177,
+			comm.Rtype181, comm.Rtype182, comm.Rtype183, comm.Rtype184, comm.Rtype185, comm.Rtype186, comm.Rtype187:
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtaskRecord.verifyFirstGreatEqualParam,
@@ -147,16 +145,25 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtask.verifyRtype20,
+			}
+
+			handles = append(handles, handle)
+			this.registerVerifyHandle(v.Id, handle)
+		case comm.Rtype109, comm.Rtype122, comm.Rtype124, comm.Rtype125, comm.Rtype126,
+			comm.Rtype127, comm.Rtype129, comm.Rtype133, comm.Rtype134, comm.Rtype158,
+			comm.Rtype159, comm.Rtype160:
+			handle := &rtaskCondHandle{
+				condId: v.Id,
+				verify: this.modelRtaskRecord.verifyFirstEqualParam,
 				update: this.modelRtaskRecord.overrideUpdate,
 			}
 
 			handles = append(handles, handle)
 			this.registerVerifyHandle(v.Id, handle)
-		case comm.Rtype109:
+		case comm.Rtype138:
 			handle := &rtaskCondHandle{
 				condId: v.Id,
-				verify: this.modelRtaskRecord.verifyFirstEqualParam,
+				verify: this.modelRtask.verifyRtype138,
-				update: this.modelRtaskRecord.overrideUpdate,
 			}
 
 			handles = append(handles, handle)
@@ -176,7 +183,8 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
 			comm.Rtype42, comm.Rtype43,
 			comm.Rtype46, comm.Rtype47,
 			comm.Rtype52, comm.Rtype55, comm.Rtype56,
-			comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140:
+			comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140,
+			comm.Rtype168, comm.Rtype169, comm.Rtype170, comm.Rtype174, comm.Rtype179, comm.Rtype180:
 			handle := &rtaskCondHandle{
 				condId: v.Id,
 				verify: this.modelRtaskRecord.verifyGreatEqual,

modules/rtask/verifyHandle.go

@@ -4,6 +4,7 @@ package rtask
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 
@@ -345,3 +346,20 @@ func (this *ModelRtask) verifyRtype63(uid string, record *pb.DBRtaskRecord, cfg
 
 	return
 }
+
+// 记录玩家在线时间并记入进度
+func (this *ModelRtask) verifyRtype138(uid string, record *pb.DBRtaskRecord, cfg *cfg.GameRdtaskCondiData) (ok bool, err error) {
+	userModule, err := this.service.GetModule(comm.ModuleUser)
+	if err != nil {
+		return
+	}
+
+	if um, y := userModule.(comm.IUser); y {
+		if user := um.GetUser(uid); user != nil {
+			now := configure.Now().Unix()
+			l := (now - user.Logintime) / 60
+			return soGreatEqual(int32(l), cfg.Data1)
+		}
+	}
+	return
+}

modules/smithy/module.go

@@ -58,7 +58,7 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
 
 	if this.IsCross() {
 		atlas := &pb.DBAtlas{}
-		if model, err := this.GetDBModelByUid(uid, this.modelAtlas.TableName, this.modelAtlas.Expired); err == nil {
+		if model, err := this.GetDBModelByUid(uid, this.modelAtlas.TableName); err == nil {
 
 			if err := model.Get(uid, atlas); err != nil { // 防止数据没有初始化情况
 				if mongo.ErrNoDocuments == err {

modules/user/model_expand.go

@@ -34,7 +34,7 @@ func (this *ModelExpand) Init(service core.IService, module core.IModule, comp c
 func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err error) {
 	result = &pb.DBUserExpand{}
 	if db.IsCross() {
-		if model, err := this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err := this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Error("Cross GetDBModuleByUid", log.Field{Key: "uid", Value: uid})
 			return result, err
 		} else {
@@ -81,7 +81,7 @@ func (this *ModelExpand) ChangeUserExpand(uid string, value map[string]interface
 		model *db.DBModel
 	)
 	if db.IsCross() {
-		if model, err = this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err == nil {
+		if model, err = this.module.GetDBModelByUid(uid, this.TableName); err == nil {
 			return model.Change(uid, value)
 		} else {
 			this.module.Errorln(err)

modules/user/model_user.go

@@ -101,7 +101,7 @@ func (this *ModelUser) GetUser(uid string) (user *pb.DBUser) {
 	// 	return
 	// }
 	if this.module.IsCross() {
-		if model, err := this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err := this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.Get(uid, user); err != nil {
@@ -119,7 +119,7 @@ func (this *ModelUser) GetUser(uid string) (user *pb.DBUser) {
 //设置属性
 func (this *ModelUser) updateUserAttr(uid string, data map[string]interface{}) error {
 	if this.module.IsCross() {
-		if model, err := this.module.GetDBModelByUid(uid, this.TableName, this.Expired); err != nil {
+		if model, err := this.module.GetDBModelByUid(uid, this.TableName); err != nil {
 			this.module.Errorln(err)
 		} else {
 			if err = model.Change(uid, data); err != nil {

modules/worldtask/module.go

@@ -160,6 +160,14 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 			this.Error("添加世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err})
 			return err
 		}
+	} else if mytask.Uid == "" {
+		update := map[string]interface{}{
+			"uid": uid,
+		}
+		if err := this.modelWorldtask.Change(uid, update); err != nil {
+			this.Error("更新世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err})
+			return err
+		}
 	}
 
 	if _, ok := utils.Findx(mytask.TaskList, taskId); ok {

pb/buried_db.pb.go

@@ -0,0 +1,252 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.20.0
+// source: buried/buried_db.proto
+
+package pb
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+//埋点对应的条件数据
+type DBBuriedItem struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Condid    int32            `protobuf:"varint,1,opt,name=condid,proto3" json:"condid"`                                                                                       //条件id
+	Timestamp int64            `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp"`                                                                                 //最后一次操作时间
+	Value     map[string]int32 `protobuf:"bytes,3,rep,name=value,proto3" json:"value" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //完成条件数据
+}
+
+func (x *DBBuriedItem) Reset() {
+	*x = DBBuriedItem{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_buried_buried_db_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBBuriedItem) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBBuriedItem) ProtoMessage() {}
+
+func (x *DBBuriedItem) ProtoReflect() protoreflect.Message {
+	mi := &file_buried_buried_db_proto_msgTypes[0]
+	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 DBBuriedItem.ProtoReflect.Descriptor instead.
+func (*DBBuriedItem) Descriptor() ([]byte, []int) {
+	return file_buried_buried_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *DBBuriedItem) GetCondid() int32 {
+	if x != nil {
+		return x.Condid
+	}
+	return 0
+}
+
+func (x *DBBuriedItem) GetTimestamp() int64 {
+	if x != nil {
+		return x.Timestamp
+	}
+	return 0
+}
+
+func (x *DBBuriedItem) GetValue() map[string]int32 {
+	if x != nil {
+		return x.Value
+	}
+	return nil
+}
+
+//DB埋点数据
+type DBBuried struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid   string          `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`        //用户ID
+	Btype int32           `protobuf:"varint,2,opt,name=btype,proto3" json:"btype" bson:"btype"` //埋点类型
+	Data  []*DBBuriedItem `protobuf:"bytes,3,rep,name=data,proto3" json:"data" bson:"data"`     //埋点同居诗句
+}
+
+func (x *DBBuried) Reset() {
+	*x = DBBuried{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_buried_buried_db_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DBBuried) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DBBuried) ProtoMessage() {}
+
+func (x *DBBuried) ProtoReflect() protoreflect.Message {
+	mi := &file_buried_buried_db_proto_msgTypes[1]
+	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 DBBuried.ProtoReflect.Descriptor instead.
+func (*DBBuried) Descriptor() ([]byte, []int) {
+	return file_buried_buried_db_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *DBBuried) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *DBBuried) GetBtype() int32 {
+	if x != nil {
+		return x.Btype
+	}
+	return 0
+}
+
+func (x *DBBuried) GetData() []*DBBuriedItem {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
+var File_buried_buried_db_proto protoreflect.FileDescriptor
+
+var file_buried_buried_db_proto_rawDesc = []byte{
+	0x0a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xae, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x42,
+	0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6e,
+	0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x64, 0x69,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12,
+	0x2e, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
+	0x2e, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x1a,
+	0x38, 0x0a, 0x0a, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x55, 0x0a, 0x08, 0x44, 0x42, 0x42,
+	0x75, 0x72, 0x69, 0x65, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_buried_buried_db_proto_rawDescOnce sync.Once
+	file_buried_buried_db_proto_rawDescData = file_buried_buried_db_proto_rawDesc
+)
+
+func file_buried_buried_db_proto_rawDescGZIP() []byte {
+	file_buried_buried_db_proto_rawDescOnce.Do(func() {
+		file_buried_buried_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_buried_buried_db_proto_rawDescData)
+	})
+	return file_buried_buried_db_proto_rawDescData
+}
+
+var file_buried_buried_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_buried_buried_db_proto_goTypes = []interface{}{
+	(*DBBuriedItem)(nil), // 0: DBBuriedItem
+	(*DBBuried)(nil),     // 1: DBBuried
+	nil,                  // 2: DBBuriedItem.ValueEntry
+}
+var file_buried_buried_db_proto_depIdxs = []int32{
+	2, // 0: DBBuriedItem.value:type_name -> DBBuriedItem.ValueEntry
+	0, // 1: DBBuried.data:type_name -> DBBuriedItem
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_buried_buried_db_proto_init() }
+func file_buried_buried_db_proto_init() {
+	if File_buried_buried_db_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_buried_buried_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBBuriedItem); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_buried_buried_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DBBuried); 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{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_buried_buried_db_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_buried_buried_db_proto_goTypes,
+		DependencyIndexes: file_buried_buried_db_proto_depIdxs,
+		MessageInfos:      file_buried_buried_db_proto_msgTypes,
+	}.Build()
+	File_buried_buried_db_proto = out.File
+	file_buried_buried_db_proto_rawDesc = nil
+	file_buried_buried_db_proto_goTypes = nil
+	file_buried_buried_db_proto_depIdxs = nil
+}

pb/buried_msg.pb.go

@@ -0,0 +1,61 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.20.0
+// source: buried/buried_msg.proto
+
+package pb
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+var File_buried_buried_msg_proto protoreflect.FileDescriptor
+
+var file_buried_buried_msg_proto_rawDesc = []byte{
+	0x0a, 0x17, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f,
+	0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var file_buried_buried_msg_proto_goTypes = []interface{}{}
+var file_buried_buried_msg_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_buried_buried_msg_proto_init() }
+func file_buried_buried_msg_proto_init() {
+	if File_buried_buried_msg_proto != nil {
+		return
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_buried_buried_msg_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   0,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_buried_buried_msg_proto_goTypes,
+		DependencyIndexes: file_buried_buried_msg_proto_depIdxs,
+	}.Build()
+	File_buried_buried_msg_proto = out.File
+	file_buried_buried_msg_proto_rawDesc = nil
+	file_buried_buried_msg_proto_goTypes = nil
+	file_buried_buried_msg_proto_depIdxs = nil
+}

pb/combat_db.pb.go

@@ -84,7 +84,7 @@ type DBCombatLevel struct {
 	Data        map[string]string `protobuf:"bytes,2,rep,name=data,proto3" json:"data" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //管卡信息
 	Passmanster []int32           `protobuf:"varint,3,rep,packed,name=passmanster,proto3" json:"passmanster"`                                                                   //通关怪物列表
 	Passdrop    []int32           `protobuf:"varint,4,rep,packed,name=passdrop,proto3" json:"passdrop"`                                                                         //通关宝箱列表
-	Pass        bool              `protobuf:"varint,5,opt,name=pass,proto3" json:"pass"`                                                                                        //是否通关
+	Pass        int32             `protobuf:"varint,5,opt,name=pass,proto3" json:"pass"`                                                                                        //通关状态  0未通关 1已通关 2完美通关
 	Progress    int32             `protobuf:"varint,6,opt,name=progress,proto3" json:"progress"`                                                                                //进度
 }
 
@@ -148,11 +148,11 @@ func (x *DBCombatLevel) GetPassdrop() []int32 {
 	return nil
 }
 
-func (x *DBCombatLevel) GetPass() bool {
+func (x *DBCombatLevel) GetPass() int32 {
 	if x != nil {
 		return x.Pass
 	}
-	return false
+	return 0
 }
 
 func (x *DBCombatLevel) GetProgress() int32 {
@@ -186,7 +186,7 @@ var file_combat_combat_db_proto_rawDesc = []byte{
 	0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x64,
 	0x72, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x64,
 	0x72, 0x6f, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72,
+	0x05, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72,
 	0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72,
 	0x65, 0x73, 0x73, 0x1a, 0x37, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
 	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,

pb/combat_msg.pb.go

@@ -432,9 +432,11 @@ type CombatChallengeReceiveResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Issucc bool  `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
+	Issucc   bool          `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"`
-	Level  int32 `protobuf:"varint,2,opt,name=level,proto3" json:"level"` //管卡id
+	Level    int32         `protobuf:"varint,2,opt,name=level,proto3" json:"level"` //管卡id
-	Pass   bool  `protobuf:"varint,3,opt,name=pass,proto3" json:"pass"`   //是否通关
+	Manster  int32         `protobuf:"varint,3,opt,name=manster,proto3" json:"manster"`
+	Atns     []*UserAssets `protobuf:"bytes,4,rep,name=atns,proto3" json:"atns"`          //获取物品
+	Progress int32         `protobuf:"varint,5,opt,name=progress,proto3" json:"progress"` //进度
 }
 
 func (x *CombatChallengeReceiveResp) Reset() {
@@ -483,11 +485,25 @@ func (x *CombatChallengeReceiveResp) GetLevel() int32 {
 	return 0
 }
 
-func (x *CombatChallengeReceiveResp) GetPass() bool {
+func (x *CombatChallengeReceiveResp) GetManster() int32 {
 	if x != nil {
-		return x.Pass
+		return x.Manster
 	}
-	return false
+	return 0
+}
+
+func (x *CombatChallengeReceiveResp) GetAtns() []*UserAssets {
+	if x != nil {
+		return x.Atns
+	}
+	return nil
+}
+
+func (x *CombatChallengeReceiveResp) GetProgress() int32 {
+	if x != nil {
+		return x.Progress
+	}
+	return 0
 }
 
 //宝箱获取请求
@@ -552,10 +568,10 @@ type CombatDropResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Code  ErrorCode     `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功
+	Code     ErrorCode     `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` //是否成功
-	Atns  []*UserAssets `protobuf:"bytes,2,rep,name=atns,proto3" json:"atns"`                 //获取物品
+	Atns     []*UserAssets `protobuf:"bytes,2,rep,name=atns,proto3" json:"atns"`                 //获取物品
-	Level int32         `protobuf:"varint,3,opt,name=level,proto3" json:"level"`              //管卡id
+	Level    int32         `protobuf:"varint,3,opt,name=level,proto3" json:"level"`              //管卡id
-	Pass  bool          `protobuf:"varint,4,opt,name=pass,proto3" json:"pass"`                //是否通关
+	Progress int32         `protobuf:"varint,4,opt,name=progress,proto3" json:"progress"`        //进度
 }
 
 func (x *CombatDropResp) Reset() {
@@ -611,11 +627,147 @@ func (x *CombatDropResp) GetLevel() int32 {
 	return 0
 }
 
-func (x *CombatDropResp) GetPass() bool {
+func (x *CombatDropResp) GetProgress() int32 {
+	if x != nil {
+		return x.Progress
+	}
+	return 0
+}
+
+//询问通关信息
+type CombatAskPassReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` //管卡id
+}
+
+func (x *CombatAskPassReq) Reset() {
+	*x = CombatAskPassReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_combat_combat_msg_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CombatAskPassReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CombatAskPassReq) ProtoMessage() {}
+
+func (x *CombatAskPassReq) ProtoReflect() protoreflect.Message {
+	mi := &file_combat_combat_msg_proto_msgTypes[10]
+	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 CombatAskPassReq.ProtoReflect.Descriptor instead.
+func (*CombatAskPassReq) Descriptor() ([]byte, []int) {
+	return file_combat_combat_msg_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *CombatAskPassReq) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
+//询问通关信息
+type CombatAskPassResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Level        int32         `protobuf:"varint,1,opt,name=level,proto3" json:"level"`                      //管卡id
+	Passmaintask []int32       `protobuf:"varint,2,rep,packed,name=passmaintask,proto3" json:"passmaintask"` //主任务完成进度
+	Passpertask  []int32       `protobuf:"varint,3,rep,packed,name=passpertask,proto3" json:"passpertask"`   //副任务完成进度
+	Pass         int32         `protobuf:"varint,4,opt,name=pass,proto3" json:"pass"`                        //通关状态  0未通关 1已通关 2完美通关
+	Mainaward    []*UserAssets `protobuf:"bytes,5,rep,name=mainaward,proto3" json:"mainaward"`               //主奖励
+	Peraward     []*UserAssets `protobuf:"bytes,6,rep,name=peraward,proto3" json:"peraward"`                 //完美奖励
+}
+
+func (x *CombatAskPassResp) Reset() {
+	*x = CombatAskPassResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_combat_combat_msg_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CombatAskPassResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CombatAskPassResp) ProtoMessage() {}
+
+func (x *CombatAskPassResp) ProtoReflect() protoreflect.Message {
+	mi := &file_combat_combat_msg_proto_msgTypes[11]
+	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 CombatAskPassResp.ProtoReflect.Descriptor instead.
+func (*CombatAskPassResp) Descriptor() ([]byte, []int) {
+	return file_combat_combat_msg_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *CombatAskPassResp) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
+func (x *CombatAskPassResp) GetPassmaintask() []int32 {
+	if x != nil {
+		return x.Passmaintask
+	}
+	return nil
+}
+
+func (x *CombatAskPassResp) GetPasspertask() []int32 {
+	if x != nil {
+		return x.Passpertask
+	}
+	return nil
+}
+
+func (x *CombatAskPassResp) GetPass() int32 {
 	if x != nil {
 		return x.Pass
 	}
-	return false
+	return 0
+}
+
+func (x *CombatAskPassResp) GetMainaward() []*UserAssets {
+	if x != nil {
+		return x.Mainaward
+	}
+	return nil
+}
+
+func (x *CombatAskPassResp) GetPeraward() []*UserAssets {
+	if x != nil {
+		return x.Peraward
+	}
+	return nil
 }
 
 var File_combat_combat_msg_proto protoreflect.FileDescriptor
@@ -669,26 +821,47 @@ var file_combat_combat_msg_proto_rawDesc = []byte{
 	0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74,
 	0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72,
-	0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5e, 0x0a, 0x1a, 0x43, 0x6f, 0x6d,
+	0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xa1, 0x01, 0x0a, 0x1a, 0x43, 0x6f,
-	0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63, 0x65,
+	0x6d, 0x62, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x63,
-	0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12,
+	0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x03, 0x20,
+	0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x73, 0x74, 0x65, 0x72,
-	0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65,
+	0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
-	0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e,
-	0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20,
-	0x64, 0x72, 0x6f, 0x70, 0x22, 0x7b, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72,
+	0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x39, 0x0a,
-	0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
+	0x0d, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65,
+	0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
-	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x18, 0x02,
+	0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x18, 0x02, 0x20, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
+	0x28, 0x05, 0x52, 0x04, 0x64, 0x72, 0x6f, 0x70, 0x22, 0x83, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d,
-	0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+	0x62, 0x61, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x12, 0x0a,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f,
-	0x04, 0x70, 0x61, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x70, 0x61, 0x73,
+	0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x04, 0x61,
-	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x74, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x33,
+	0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05,
+	0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76,
+	0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x22, 0x28,
+	0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x50, 0x61, 0x73, 0x73, 0x52,
+	0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xd7, 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6d,
+	0x62, 0x61, 0x74, 0x41, 0x73, 0x6b, 0x50, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14,
+	0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
+	0x65, 0x76, 0x65, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x61, 0x73, 0x73, 0x6d, 0x61, 0x69, 0x6e,
+	0x74, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x61, 0x73, 0x73,
+	0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x73, 0x73,
+	0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70,
+	0x61, 0x73, 0x73, 0x70, 0x65, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61,
+	0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x73, 0x73, 0x12, 0x29,
+	0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x09,
+	0x6d, 0x61, 0x69, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x27, 0x0a, 0x08, 0x70, 0x65, 0x72,
+	0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x08, 0x70, 0x65, 0x72, 0x61, 0x77, 0x61,
+	0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -703,7 +876,7 @@ func file_combat_combat_msg_proto_rawDescGZIP() []byte {
 	return file_combat_combat_msg_proto_rawDescData
 }
 
-var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_combat_combat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
 var file_combat_combat_msg_proto_goTypes = []interface{}{
 	(*CombatInReq)(nil),                // 0: CombatInReq
 	(*CombatInResp)(nil),               // 1: CombatInResp
@@ -715,28 +888,33 @@ var file_combat_combat_msg_proto_goTypes = []interface{}{
 	(*CombatChallengeReceiveResp)(nil), // 7: CombatChallengeReceiveResp
 	(*CombatDropReq)(nil),              // 8: CombatDropReq
 	(*CombatDropResp)(nil),             // 9: CombatDropResp
-	nil,                                // 10: CombatUpdateLevelReq.DataEntry
+	(*CombatAskPassReq)(nil),           // 10: CombatAskPassReq
-	(*DBCombatLevel)(nil),              // 11: DBCombatLevel
+	(*CombatAskPassResp)(nil),          // 11: CombatAskPassResp
-	(*BattleFormation)(nil),            // 12: BattleFormation
+	nil,                                // 12: CombatUpdateLevelReq.DataEntry
-	(ErrorCode)(0),                     // 13: ErrorCode
+	(*DBCombatLevel)(nil),              // 13: DBCombatLevel
-	(*BattleInfo)(nil),                 // 14: BattleInfo
+	(*BattleFormation)(nil),            // 14: BattleFormation
-	(*BattleReport)(nil),               // 15: BattleReport
+	(ErrorCode)(0),                     // 15: ErrorCode
-	(*UserAssets)(nil),                 // 16: UserAssets
+	(*BattleInfo)(nil),                 // 16: BattleInfo
+	(*BattleReport)(nil),               // 17: BattleReport
+	(*UserAssets)(nil),                 // 18: UserAssets
 }
 var file_combat_combat_msg_proto_depIdxs = []int32{
-	11, // 0: CombatInResp.level:type_name -> DBCombatLevel
+	13, // 0: CombatInResp.level:type_name -> DBCombatLevel
-	10, // 1: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry
+	12, // 1: CombatUpdateLevelReq.data:type_name -> CombatUpdateLevelReq.DataEntry
-	12, // 2: CombatChallengeReq.battle:type_name -> BattleFormation
+	14, // 2: CombatChallengeReq.battle:type_name -> BattleFormation
-	13, // 3: CombatChallengeResp.code:type_name -> ErrorCode
+	15, // 3: CombatChallengeResp.code:type_name -> ErrorCode
-	14, // 4: CombatChallengeResp.info:type_name -> BattleInfo
+	16, // 4: CombatChallengeResp.info:type_name -> BattleInfo
-	15, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport
+	17, // 5: CombatChallengeReceiveReq.report:type_name -> BattleReport
-	13, // 6: CombatDropResp.code:type_name -> ErrorCode
+	18, // 6: CombatChallengeReceiveResp.atns:type_name -> UserAssets
-	16, // 7: CombatDropResp.atns:type_name -> UserAssets
+	15, // 7: CombatDropResp.code:type_name -> ErrorCode
-	8,  // [8:8] is the sub-list for method output_type
+	18, // 8: CombatDropResp.atns:type_name -> UserAssets
-	8,  // [8:8] is the sub-list for method input_type
+	18, // 9: CombatAskPassResp.mainaward:type_name -> UserAssets
-	8,  // [8:8] is the sub-list for extension type_name
+	18, // 10: CombatAskPassResp.peraward:type_name -> UserAssets
-	8,  // [8:8] is the sub-list for extension extendee
+	11, // [11:11] is the sub-list for method output_type
-	0,  // [0:8] is the sub-list for field type_name
+	11, // [11:11] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_combat_combat_msg_proto_init() }
@@ -869,6 +1047,30 @@ func file_combat_combat_msg_proto_init() {
 				return nil
 			}
 		}
+		file_combat_combat_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CombatAskPassReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_combat_combat_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CombatAskPassResp); 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{
@@ -876,7 +1078,7 @@ func file_combat_combat_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_combat_combat_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   11,
+			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

sys/configure/structs/Game.BuffType.go

@@ -77,4 +77,7 @@ const (
     GameBuffType_TIGER_ROAR = 65
     GameBuffType_FORGET = 66
     GameBuffType_RAMPAGE = 67
+    GameBuffType_DISABLE_REVIVE = 68
+    GameBuffType_INNOCENCE = 69
+    GameBuffType_FANGS = 70
 )

sys/configure/structs/Game.CombatLevelData.go

@@ -14,9 +14,11 @@ type GameCombatLevelData struct {
     Id int32
     Scene string
     Levelname string
-    PassformatList []int32
+    Maintask []int32
-    Passdroplist []int32
+    Subtask []int32
     Award []*Gameatn
+    Profectaward []*Gameatn
+    Debrisitemid string
     Scenemusic string
     Atmosphere string
 }
@@ -34,28 +36,28 @@ func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err erro
      {
                 var _arr_ []interface{}
                 var _ok_ bool
-                if _arr_, _ok_ = _buf["passformatList"].([]interface{}); !_ok_ { err = errors.New("passformatList error"); return }
+                if _arr_, _ok_ = _buf["maintask"].([]interface{}); !_ok_ { err = errors.New("maintask error"); return }
 
-                _v.PassformatList = make([]int32, 0, len(_arr_))
+                _v.Maintask = 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.PassformatList = append(_v.PassformatList, _list_v_)
+                    _v.Maintask = append(_v.Maintask, _list_v_)
                 }
             }
 
      {
                 var _arr_ []interface{}
                 var _ok_ bool
-                if _arr_, _ok_ = _buf["passdroplist"].([]interface{}); !_ok_ { err = errors.New("passdroplist error"); return }
+                if _arr_, _ok_ = _buf["subtask"].([]interface{}); !_ok_ { err = errors.New("subtask error"); return }
 
-                _v.Passdroplist = make([]int32, 0, len(_arr_))
+                _v.Subtask = 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.Passdroplist = append(_v.Passdroplist, _list_v_)
+                    _v.Subtask = append(_v.Subtask, _list_v_)
                 }
             }
 
@@ -73,6 +75,21 @@ func (_v *GameCombatLevelData)Deserialize(_buf map[string]interface{}) (err erro
                 }
             }
 
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["profectaward"].([]interface{}); !_ok_ { err = errors.New("profectaward error"); return }
+
+                _v.Profectaward = 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.Profectaward = append(_v.Profectaward, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; if _v.Debrisitemid, _ok_ = _buf["debrisitemid"].(string); !_ok_ { err = errors.New("debrisitemid error"); return } }
     { var _ok_ bool; if _v.Scenemusic, _ok_ = _buf["scenemusic"].(string); !_ok_ { err = errors.New("scenemusic error"); return } }
     { var _ok_ bool; if _v.Atmosphere, _ok_ = _buf["atmosphere"].(string); !_ok_ { err = errors.New("atmosphere error"); return } }
     return

sys/configure/structs/Game.LinestoryMainTaskData.go

@@ -19,6 +19,8 @@ type GameLinestoryMainTaskData struct {
     Stageid int32
     Name string
     Describe string
+    Mainstoryid string
+    Substoryid string
     Img string
 }
 
@@ -37,6 +39,8 @@ func (_v *GameLinestoryMainTaskData)Deserialize(_buf map[string]interface{}) (er
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stageid"].(float64); !_ok_ { err = errors.New("stageid error"); return }; _v.Stageid = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Mainstoryid, _ok_ = _buf["mainstoryid"].(string); !_ok_ { err = errors.New("mainstoryid error"); return } }
+    { var _ok_ bool; if _v.Substoryid, _ok_ = _buf["substoryid"].(string); !_ok_ { err = errors.New("substoryid error"); return } }
     { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
     return
 }

sys/configure/structs/Game.SkillEffectType.go

@@ -31,20 +31,23 @@ const (
     GameSkillEffectType_FrontDmg_1 = 20
     GameSkillEffectType_FrontDmg_2 = 21
     GameSkillEffectType_FrontDmg_3 = 22
-    GameSkillEffectType_ExtraDmg_1 = 23
+    GameSkillEffectType_FrontDmg_4 = 23
-    GameSkillEffectType_ExtraDmg_2 = 24
+    GameSkillEffectType_ExtraDmg_1 = 24
-    GameSkillEffectType_ExtraDmg_3 = 25
+    GameSkillEffectType_ExtraDmg_2 = 25
-    GameSkillEffectType_ExtraDmg_4 = 26
+    GameSkillEffectType_ExtraDmg_3 = 26
-    GameSkillEffectType_Round = 27
+    GameSkillEffectType_ExtraDmg_4 = 27
-    GameSkillEffectType_TreBeyondByAddBuff = 28
+    GameSkillEffectType_Round = 28
-    GameSkillEffectType_DpsByTre = 29
+    GameSkillEffectType_TreBeyondByAddBuff = 29
-    GameSkillEffectType_Rebirth = 30
+    GameSkillEffectType_DpsByTre = 30
-    GameSkillEffectType_StealBuff = 31
+    GameSkillEffectType_Rebirth = 31
-    GameSkillEffectType_BuffDmg = 32
+    GameSkillEffectType_StealBuff = 32
-    GameSkillEffectType_BuffTre = 33
+    GameSkillEffectType_BuffDmg = 33
-    GameSkillEffectType_ShiftOurAllBuff = 34
+    GameSkillEffectType_BuffTre = 34
-    GameSkillEffectType_DrawActValueToTeam = 35
+    GameSkillEffectType_ShiftOurAllBuff = 35
-    GameSkillEffectType_SpecialTre = 36
+    GameSkillEffectType_DrawActValueToTeam = 36
-    GameSkillEffectType_RandChildSkill = 37
+    GameSkillEffectType_SpecialTre = 37
-    GameSkillEffectType_AddActValueByEffect = 38
+    GameSkillEffectType_RandChildSkill = 38
+    GameSkillEffectType_AddActValueByEffect = 39
+    GameSkillEffectType_TreByBuffNum = 40
+    GameSkillEffectType_GetTargetBuffNum = 41
 )