护月任务奖励

bin/json/game_buriedcondi.json

@@ -19119,7 +19119,9 @@
     "id": 110001,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_572",
@@ -19153,7 +19155,9 @@
     "id": 110003,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_573",
@@ -19187,7 +19191,9 @@
     "id": 110004,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_574",
@@ -19221,7 +19227,9 @@
     "id": 110005,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_575",
@@ -19255,7 +19263,9 @@
     "id": 110006,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_576",
@@ -19289,7 +19299,9 @@
     "id": 110007,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_577",
@@ -19321,7 +19333,9 @@
     "id": 110008,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_578",
@@ -19353,7 +19367,9 @@
     "id": 110009,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_579",
@@ -19385,7 +19401,9 @@
     "id": 110010,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_580",
@@ -19417,7 +19435,9 @@
     "id": 110012,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_581",
@@ -19449,7 +19469,9 @@
     "id": 110013,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_582",
@@ -19481,7 +19503,9 @@
     "id": 110014,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_583",
@@ -19513,7 +19537,9 @@
     "id": 110015,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_584",
@@ -19545,7 +19571,9 @@
     "id": 110016,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_585",
@@ -19579,7 +19607,9 @@
     "id": 110017,
     "rtype": 1,
     "ctype": 1,
-    "notify": [],
+    "notify": [
+      "moonlv"
+    ],
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_586",

bin/json/game_monsterformat.json

@@ -233807,7 +233807,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": -1,
+    "heroid": 51050,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -233827,7 +233827,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": -1,
+    "heroid": 51050,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -233847,7 +233847,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": -1,
+    "heroid": 51050,
     "star": 3,
     "equip": [],
     "newskill": [],

bin/json/game_moonlv.json

@@ -2,7 +2,7 @@
   {
     "Id": 1,
     "Level": 1,
-    "TaskGroupId": 10001,
+    "TaskGroupId": 1001,
     "Reward": [
       {
         "a": "item",
@@ -19,7 +19,7 @@
   {
     "Id": 2,
     "Level": 2,
-    "TaskGroupId": 10002,
+    "TaskGroupId": 1002,
     "Reward": [
       {
         "a": "item",
@@ -36,7 +36,7 @@
   {
     "Id": 3,
     "Level": 3,
-    "TaskGroupId": 10003,
+    "TaskGroupId": 1003,
     "Reward": [
       {
         "a": "item",

bin/json/game_opencond.json

@@ -2475,5 +2475,383 @@
       "key": "",
       "text": ""
     }
+  },
+  {
+    "id": "shop1",
+    "name": {
+      "key": "opencond_opencond_name_93",
+      "text": "金币商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop2",
+    "name": {
+      "key": "opencond_opencond_name_94",
+      "text": "月光原石商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop3",
+    "name": {
+      "key": "opencond_opencond_name_95",
+      "text": "友情专柜"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop4",
+    "name": {
+      "key": "opencond_opencond_name_96",
+      "text": "斗士专柜"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 1
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop5",
+    "name": {
+      "key": "opencond_opencond_name_97",
+      "text": "名流专柜"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 2
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop6",
+    "name": {
+      "key": "opencond_opencond_name_98",
+      "text": "守护专柜"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 3
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop7",
+    "name": {
+      "key": "opencond_opencond_name_99",
+      "text": "第一章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 4
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop8",
+    "name": {
+      "key": "opencond_opencond_name_100",
+      "text": "第二章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 5
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop9",
+    "name": {
+      "key": "opencond_opencond_name_101",
+      "text": "第三章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 6
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop10",
+    "name": {
+      "key": "opencond_opencond_name_102",
+      "text": "第四章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 7
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop11",
+    "name": {
+      "key": "opencond_opencond_name_103",
+      "text": "第五章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 8
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop12",
+    "name": {
+      "key": "opencond_opencond_name_104",
+      "text": "第六章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 9
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop13",
+    "name": {
+      "key": "opencond_opencond_name_105",
+      "text": "第七章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 10
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
+  },
+  {
+    "id": "shop14",
+    "name": {
+      "key": "opencond_opencond_name_106",
+      "text": "第八章商店"
+    },
+    "main": [
+      {
+        "key": 1,
+        "param": 11
+      }
+    ],
+    "wkqbx": 2,
+    "img": "",
+    "prompt": {
+      "key": "",
+      "text": ""
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
   }
 ]

bin/json/game_rdtasknpc.json

@@ -404,6 +404,21 @@
     ],
     "goto": 0
   },
+  {
+    "id": 100109,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "功能入口-招募",
+      "901"
+    ],
+    "event": [
+      2,
+      10031
+    ],
+    "goto": 0
+  },
   {
     "id": 10020,
     "heroid": 44004,

bin/json/game_shop.json

@@ -170,8 +170,8 @@
       "key": "shop_shop_upper_shop_7",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -197,8 +197,8 @@
       "key": "shop_shop_upper_shop_8",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -227,8 +227,8 @@
       "key": "shop_shop_upper_shop_9",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -257,8 +257,8 @@
       "key": "shop_shop_upper_shop_10",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -287,8 +287,8 @@
       "key": "shop_shop_upper_shop_11",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -314,8 +314,8 @@
       "key": "shop_shop_upper_shop_12",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -344,8 +344,8 @@
       "key": "shop_shop_upper_shop_13",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [
@@ -374,8 +374,8 @@
       "key": "shop_shop_upper_shop_14",
       "text": "主线商店"
     },
-    "rtype": 2,
+    "rtype": -1,
-    "rtime": 21,
+    "rtime": 0,
     "rnum": -1,
     "rneed": [],
     "shopitem": [

bin/json/game_worldtask.json

@@ -85,7 +85,7 @@
     ],
     "deliver_npc": 0,
     "taskend_removeitem": [],
-    "auto_accept": 0,
+    "auto_accept": 1,
     "tasktips": 0,
     "lock_add": 0,
     "finish": [],

comm/imodule.go

@@ -680,4 +680,7 @@ type (
 		// 添加三消卡片资源
 		AddXxlCard(session IUserSession, cards map[string]int32, bPush bool) (errdata *pb.ErrorData)
 	}
+	IMoonlv interface {
+		IBuriedUpdateNotify
+	}
 )

modules/moonlv/api_getlist.go

@@ -22,6 +22,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MoonlvGetListReq
 		}
 		return
 	}
+
 	session.SendMsg(string(this.module.GetType()), "getlist", &pb.MoonlvGetListResp{
 		Data: list,
 	})

modules/moonlv/api_lvaward.go

@@ -3,6 +3,7 @@ package moonlv
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 )
 
 //参数校验
@@ -20,6 +21,8 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.MoonlvAwardRe
 func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (errdata *pb.ErrorData) {
 	var (
 		update map[string]interface{}
+		lvConf *cfg.GameMoonLvData
+		atno   []*pb.UserAtno
 	)
 	update = make(map[string]interface{}, 0)
 	list, err := this.module.modelMoonlv.getMoonlvList(session.GetUserId())
@@ -46,21 +49,26 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
 			return
 		}
 	}
-
+	if lvConf, err = this.module.configure.GetMoonLvConf(list.Lv); err != nil {
-	if _, err := this.module.configure.GetMoonLvConf(list.Lv + 1); err != nil { // 查看能不能继续升级
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ConfigNoFound,
+			Title: pb.ErrorCode_ConfigNoFound.ToString(),
+		}
+		return
+	}
+	if _, err := this.module.configure.GetMoonLvConf(list.Lv + 1); err == nil { // 查看能不能继续升级
 		list.Lv += 1
 		update["lv"] = list.Lv
 		// 升级了清空当前任务
 		list.Tasks = nil
 		// 重置任务
 		var szTaskid []int32
-		if lvConf, err := this.module.configure.GetMoonLvConf(list.Lv); err != nil {
+
-			if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err != nil {
+		if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err == nil {
 			for _, v := range conf {
 				szTaskid = append(szTaskid, v.TaskId) // 获取任务id
 			}
 		}
-		}
 		if data, err := this.module.ModuleBuried.CheckCondition(session.GetUserId(), szTaskid...); err == nil {
 			for _, v := range data {
 				tmp := &pb.MoonTask{
@@ -87,9 +95,12 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
 		}
 		return
 	}
+	if errdata, atno = this.module.DispenseAtno(session, lvConf.Reward, true); errdata != nil {
+		return
+	}
 	session.SendMsg(string(this.module.GetType()), "award", &pb.MoonlvAwardResp{
-		Data: &pb.DBMoonLv{},
+		Data: list,
-		Res:  []*pb.UserAssets{},
+		Res:  atno,
 	})
 	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
 		this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeMoonLv, list.Lv)

modules/moonlv/api_receive.go

@@ -53,7 +53,8 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.MoonlvTaskAwar
 		}
 		return
 	}
-	if conf, err := this.module.configure.GetMoonLvTaskConfByTaskId(list.Lv, req.TaskId); err != nil {
+	if c, err := this.module.configure.GetMoonLvConf(list.Lv); err == nil {
+		if conf, err := this.module.configure.GetMoonLvTaskConfByTaskId(c.TaskGroupId, req.TaskId); err != nil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_ConfigNoFound,
 				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
@@ -65,6 +66,7 @@ func (this *apiComp) TaskAward(session comm.IUserSession, req *pb.MoonlvTaskAwar
 				return
 			}
 		}
+	}
 
 	session.SendMsg(string(this.module.GetType()), "taskaward", &pb.MoonlvTaskAwardResp{
 		TaskId: req.TaskId,

modules/moonlv/model_moonlv.go

@@ -36,8 +36,8 @@ func (this *modelMoonlv) getMoonlvList(uid string) (result *pb.DBMoonLv, err err
 			result.Lv = 1 // 默认1级
 			result.Reward = make(map[int32]bool)
 			var szTaskid []int32
-			if lvConf, err := this.module.configure.GetMoonLvConf(1); err != nil {
+			if lvConf, err := this.module.configure.GetMoonLvConf(1); err == nil {
-				if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err != nil {
+				if conf, err := this.module.configure.GetMoonLvTaskConf(lvConf.TaskGroupId); err == nil {
 					for _, v := range conf {
 						szTaskid = append(szTaskid, v.TaskId) // 获取任务id
 					}

modules/moonlv/module.go

@@ -43,7 +43,7 @@ func (this *Moonlv) BuriedsNotify(session comm.IUserSession, conds []*pb.ConIPro
 	var groupID int32
 	this.Debug("护月任务通知", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "conds", Value: conds})
 	dt, err := this.modelMoonlv.getMoonlvList(session.GetUserId())
-	if c, e := this.configure.GetMoonLvConf(dt.Lv); e != nil {
+	if c, e := this.configure.GetMoonLvConf(dt.Lv); e == nil {
 		groupID = c.TaskGroupId
 	}
 	confList, err := this.configure.GetMoonLvTaskConf(groupID)

pb/moonlv_msg.pb.go

@@ -160,7 +160,7 @@ type MoonlvAwardResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Data *DBMoonLv   `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` // 奖励信息
-	Res  []*UserAssets `protobuf:"bytes,2,rep,name=res,proto3" json:"res"`   // 获得的奖励
+	Res  []*UserAtno `protobuf:"bytes,2,rep,name=res,proto3" json:"res"`   // 获得的奖励
 }
 
 func (x *MoonlvAwardResp) Reset() {
@@ -202,7 +202,7 @@ func (x *MoonlvAwardResp) GetData() *DBMoonLv {
 	return nil
 }
 
-func (x *MoonlvAwardResp) GetRes() []*UserAssets {
+func (x *MoonlvAwardResp) GetRes() []*UserAtno {
 	if x != nil {
 		return x.Res
 	}
@@ -333,23 +333,23 @@ var file_moonlv_moonlv_msg_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x4c, 0x76, 0x52,
 	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x0a, 0x0e, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c, 0x76, 0x41,
 	0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x4f, 0x0a, 0x0f, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c,
+	0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x4d, 0x0a, 0x0f, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c,
 	0x76, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61,
 	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f,
-	0x6e, 0x4c, 0x76, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73,
+	0x6e, 0x4c, 0x76, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
-	0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x2c, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e,
+	0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x2c, 0x0a, 0x12, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c, 0x76,
-	0x6c, 0x76, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16,
+	0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06,
-	0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61,
-	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x6f, 0x0a, 0x13, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c, 0x76,
+	0x73, 0x6b, 0x49, 0x64, 0x22, 0x6f, 0x0a, 0x13, 0x4d, 0x6f, 0x6f, 0x6e, 0x6c, 0x76, 0x54, 0x61,
-	0x54, 0x61, 0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
+	0x73, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74,
-	0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
+	0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
-	0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x6b, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
+	0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06,
-	0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x4c,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x4d, 0x6f, 0x6f, 0x6e, 0x4c, 0x76, 0x52,
-	0x76, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -373,14 +373,13 @@ var file_moonlv_moonlv_msg_proto_goTypes = []interface{}{
 	(*MoonlvTaskAwardReq)(nil),  // 4: MoonlvTaskAwardReq
 	(*MoonlvTaskAwardResp)(nil), // 5: MoonlvTaskAwardResp
 	(*DBMoonLv)(nil),            // 6: DBMoonLv
-	(*UserAssets)(nil),          // 7: UserAssets
+	(*UserAtno)(nil),            // 7: UserAtno
-	(*UserAtno)(nil),            // 8: UserAtno
 }
 var file_moonlv_moonlv_msg_proto_depIdxs = []int32{
 	6, // 0: MoonlvGetListResp.data:type_name -> DBMoonLv
 	6, // 1: MoonlvAwardResp.data:type_name -> DBMoonLv
-	7, // 2: MoonlvAwardResp.res:type_name -> UserAssets
+	7, // 2: MoonlvAwardResp.res:type_name -> UserAtno
-	8, // 3: MoonlvTaskAwardResp.reward:type_name -> UserAtno
+	7, // 3: MoonlvTaskAwardResp.reward:type_name -> UserAtno
 	6, // 4: MoonlvTaskAwardResp.data:type_name -> DBMoonLv
 	5, // [5:5] is the sub-list for method output_type
 	5, // [5:5] is the sub-list for method input_type

sys/configure/structs/Game.AskedRecruit.go

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameAskedRecruit struct {
+    _dataMap map[int32]*GameAskedRecruitData
+    _dataList []*GameAskedRecruitData
+}
+
+func NewGameAskedRecruit(_buf []map[string]interface{}) (*GameAskedRecruit, error) {
+	_dataList := make([]*GameAskedRecruitData, 0, len(_buf))
+	dataMap := make(map[int32]*GameAskedRecruitData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameAskedRecruitData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Key] = _v
+		}
+	}
+	return &GameAskedRecruit{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameAskedRecruit) GetDataMap() map[int32]*GameAskedRecruitData {
+    return table._dataMap
+}
+
+func (table *GameAskedRecruit) GetDataList() []*GameAskedRecruitData {
+    return table._dataList
+}
+
+func (table *GameAskedRecruit) Get(key int32) *GameAskedRecruitData {
+    return table._dataMap[key]
+}
+
+

sys/configure/structs/Game.AskedRecruitData.go

@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameAskedRecruitData struct {
+    Key int32
+    Type int32
+    StoryText string
+    OptionText1 string
+    OptionText2 string
+}
+
+const TypeId_GameAskedRecruitData = -1734193524
+
+func (*GameAskedRecruitData) GetTypeId() int32 {
+    return -1734193524
+}
+
+func (_v *GameAskedRecruitData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["storyText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StoryText error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StoryText, _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["optionText1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.OptionText1 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.OptionText1, _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["optionText2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.OptionText2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.OptionText2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    return
+}
+
+func DeserializeGameAskedRecruitData(_buf map[string]interface{}) (*GameAskedRecruitData, error) {
+    v := &GameAskedRecruitData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}

sys/configure/structs/Game.BattleReadyData.go

@@ -19,6 +19,7 @@ type GameBattleReadyData struct {
     BGMusic string
     LoadingId int32
     HideAlienSpace int32
+    HideFightUI int32
     RuleTips string
     BattleTips string
     BattleEvents []int32
@@ -65,6 +66,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; if _v.BGMusic, _ok_ = _buf["BGMusic"].(string); !_ok_ { err = errors.New("BGMusic error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoadingId"].(float64); !_ok_ { err = errors.New("LoadingId error"); return }; _v.LoadingId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideFightUI"].(float64); !_ok_ { err = errors.New("HideFightUI error"); return }; _v.HideFightUI = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _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["BattleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BattleTips error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BattleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
      {

sys/configure/structs/Game.BuffType.go

@@ -131,4 +131,5 @@ const (
     GameBuffType_SWORD_WALTZ = 138
     GameBuffType_GOLDEN_EGG = 139
     GameBuffType_DRAGON_FORM = 140
+    GameBuffType_PROPERTY_EFFECT_AMPLIFY = 141
 )

sys/configure/structs/Tables.go

@@ -303,6 +303,7 @@ type Tables struct {
     Effect *GameEffect
     MoonLv *GameMoonLv
     MoonTask *GameMoonTask
+    AskedRecruit *GameAskedRecruit
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -2062,5 +2063,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.MoonTask, err = NewGameMoonTask(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_askedrecruit") ; err != nil {
+        return nil, err
+    }
+    if tables.AskedRecruit, err = NewGameAskedRecruit(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }