铁匠铺红点信息

bin/json/game_buriedcondi.json

@@ -17171,7 +17171,7 @@
     ],
     "filter2": [
       "英雄ID",
-      "0",
+      "装备数量",
       "0",
       "0"
     ]
@@ -17519,7 +17519,7 @@
     },
     "type": 41,
     "valid": 0,
-    "NPC": 10264,
+    "NPC": 0,
     "value": 1,
     "filter": [
       3
@@ -17543,7 +17543,7 @@
     },
     "type": 43,
     "valid": 0,
-    "NPC": 10274,
+    "NPC": 0,
     "value": 3,
     "filter": [
       6

bin/json/game_pandamasjx.json

@@ -1,6 +1,7 @@
 [
   {
     "id": "10001",
+    "job": 1,
     "race": 1,
     "type": 1,
     "name": {
@@ -35,6 +36,7 @@
   },
   {
     "id": "10002",
+    "job": 2,
     "race": 2,
     "type": 1,
     "name": {
@@ -69,6 +71,7 @@
   },
   {
     "id": "10003",
+    "job": 3,
     "race": 3,
     "type": 1,
     "name": {
@@ -103,6 +106,7 @@
   },
   {
     "id": "10004",
+    "job": 4,
     "race": 4,
     "type": 1,
     "name": {
@@ -148,6 +152,7 @@
   },
   {
     "id": "10005",
+    "job": 1,
     "race": 1,
     "type": 1,
     "name": {
@@ -182,6 +187,7 @@
   },
   {
     "id": "10006",
+    "job": 2,
     "race": 2,
     "type": 1,
     "name": {
@@ -216,6 +222,7 @@
   },
   {
     "id": "10007",
+    "job": 3,
     "race": 3,
     "type": 1,
     "name": {
@@ -250,6 +257,7 @@
   },
   {
     "id": "10008",
+    "job": 4,
     "race": 4,
     "type": 1,
     "name": {
@@ -284,6 +292,7 @@
   },
   {
     "id": "10009",
+    "job": 1,
     "race": 1,
     "type": 1,
     "name": {
@@ -329,6 +338,7 @@
   },
   {
     "id": "10010",
+    "job": 2,
     "race": 2,
     "type": 1,
     "name": {
@@ -374,6 +384,7 @@
   },
   {
     "id": "10011",
+    "job": 3,
     "race": 1,
     "type": 1,
     "name": {
@@ -419,6 +430,7 @@
   },
   {
     "id": "10012",
+    "job": 4,
     "race": 2,
     "type": 1,
     "name": {
@@ -464,6 +476,7 @@
   },
   {
     "id": "20001",
+    "job": 1,
     "race": 0,
     "type": 2,
     "name": {
@@ -509,6 +522,7 @@
   },
   {
     "id": "20002",
+    "job": 2,
     "race": 0,
     "type": 2,
     "name": {
@@ -543,6 +557,7 @@
   },
   {
     "id": "20003",
+    "job": 3,
     "race": 0,
     "type": 2,
     "name": {
@@ -577,6 +592,7 @@
   },
   {
     "id": "20004",
+    "job": 4,
     "race": 0,
     "type": 2,
     "name": {
@@ -611,6 +627,7 @@
   },
   {
     "id": "20005",
+    "job": 1,
     "race": 0,
     "type": 2,
     "name": {
@@ -645,6 +662,7 @@
   },
   {
     "id": "20006",
+    "job": 2,
     "race": 0,
     "type": 2,
     "name": {
@@ -679,6 +697,7 @@
   },
   {
     "id": "20007",
+    "job": 3,
     "race": 0,
     "type": 2,
     "name": {
@@ -713,6 +732,7 @@
   },
   {
     "id": "20008",
+    "job": 4,
     "race": 0,
     "type": 2,
     "name": {
@@ -747,6 +767,7 @@
   },
   {
     "id": "20009",
+    "job": 1,
     "race": 0,
     "type": 2,
     "name": {
@@ -792,6 +813,7 @@
   },
   {
     "id": "20010",
+    "job": 2,
     "race": 0,
     "type": 2,
     "name": {
@@ -837,6 +859,7 @@
   },
   {
     "id": "20011",
+    "job": 3,
     "race": 0,
     "type": 2,
     "name": {
@@ -882,6 +905,7 @@
   },
   {
     "id": "20012",
+    "job": 4,
     "race": 0,
     "type": 2,
     "name": {
@@ -927,6 +951,7 @@
   },
   {
     "id": "20013",
+    "job": 1,
     "race": 0,
     "type": 2,
     "name": {
@@ -972,6 +997,7 @@
   },
   {
     "id": "20014",
+    "job": 2,
     "race": 0,
     "type": 2,
     "name": {
@@ -1006,6 +1032,7 @@
   },
   {
     "id": "20015",
+    "job": 3,
     "race": 0,
     "type": 2,
     "name": {
@@ -1040,6 +1067,7 @@
   },
   {
     "id": "20016",
+    "job": 4,
     "race": 0,
     "type": 2,
     "name": {
@@ -1074,6 +1102,7 @@
   },
   {
     "id": "20017",
+    "job": 1,
     "race": 0,
     "type": 2,
     "name": {
@@ -1117,6 +1146,7 @@
   },
   {
     "id": "20018",
+    "job": 2,
     "race": 0,
     "type": 2,
     "name": {
@@ -1160,6 +1190,7 @@
   },
   {
     "id": "20019",
+    "job": 3,
     "race": 0,
     "type": 2,
     "name": {
@@ -1203,6 +1234,7 @@
   },
   {
     "id": "20020",
+    "job": 4,
     "race": 0,
     "type": 2,
     "name": {

bin/json/game_rdtasknpc.json

@@ -322,7 +322,7 @@
     "goto": 0
   },
   {
-    "id": 10020,
+    "id": 100101,
     "heroid": 25001,
     "datas": [
       "GameMain",
@@ -335,6 +335,44 @@
     ],
     "goto": 0
   },
+  {
+    "id": 100104,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [
+      0
+    ],
+    "goto": 0
+  },
+  {
+    "id": 100108,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [
+      0
+    ],
+    "goto": 0
+  },
+  {
+    "id": 10020,
+    "heroid": 25001,
+    "datas": [
+      "GameMain",
+      "20020_小怪_船甲板",
+      "901"
+    ],
+    "event": [
+      2,
+      10042
+    ],
+    "goto": 0
+  },
   {
     "id": 10024,
     "heroid": 51004,

bin/json/game_skillafteratk.json

@@ -20436,7 +20436,7 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 1,
     "Argu": [

comm/const.go

@@ -447,6 +447,11 @@ const (
 	Reddot31 ReddotType = 10031 //维京远征 有挑战次数
 	Reddot32 ReddotType = 10032 //狩猎 有挑战次数
 	Reddot33 ReddotType = 10033 //附魔副本 有挑战次数
+
+	// 铁匠铺
+	Reddot17102 ReddotType = 17102 // 铁匠铺手册台
+	Reddot17106 ReddotType = 17106 // 铁匠铺手册台收藏家奖励上
+	Reddot17107 ReddotType = 17107 // 铁匠铺手册台收藏家奖励按钮上
 )
 
 type TaskType int32

comm/imodule.go

@@ -467,6 +467,7 @@ type (
 
 	ISmithy interface {
 		CheckActivateAtlasCollect(uid string, id string)
+		IReddot // 铁匠铺红点
 	}
 
 	IPandaAtlas interface {

modules/smithy/model_atlas.go

@@ -143,3 +143,19 @@ func (this *modelAtlas) CheckActivateEquipAtlas(uid string, Equip []*pb.DB_Equip
 	}
 	return true
 }
+
+// 红点检测
+func (this *modelAtlas) checkReddot17102(uid string) bool {
+	list, _ := this.module.modelAtlas.getSmithyAtlasList(uid)
+	for _, v := range list.Atlas {
+		if v.Activate == false {
+			return true
+		} else {
+			if v.Data2 != nil {
+				return true
+			}
+		}
+	}
+
+	return false
+}

modules/smithy/model_task.go

@@ -170,6 +170,20 @@ func (this *modelTask) updateTaskRecord(uid string, taskId int32) error {
 	return nil
 }
 
+// 红点检测
+func (this *modelTask) checkReddot17107(uid string) bool {
+	dt, err := this.getTaskRecord(uid)
+	if err != nil {
+		return false
+	}
+	for _, v := range dt.Tasks {
+		if v.Received == 1 {
+			return true
+		}
+	}
+	return false
+}
+
 // 检查任务状态
 // func (this *modelTask) checkTaskStatus(uid string, taskId int32) bool {
 // 	conf, _ := this.module.configure.GetSmithyTask(taskId)

modules/smithy/module.go

@@ -119,3 +119,19 @@ func (this *Smithy) CheckActivateAtlasCollect(uid string, id string) {
 	}
 	return
 }
+
+func (this *Smithy) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]bool) {
+	reddot = make(map[comm.ReddotType]bool)
+	for _, v := range rid {
+		switch v {
+		case comm.Reddot17102: // 铁匠铺手册台
+			reddot[comm.Reddot17102] = this.modelAtlas.checkReddot17102(session.GetUserId())
+			break
+		case comm.Reddot17107: // 铁匠铺手册台收藏家奖励按钮上
+			reddot[comm.Reddot17107] = this.modelTask.checkReddot17107(session.GetUserId())
+			break
+		}
+
+	}
+	return
+}

sys/configure/structs/Game.PandamasJxData.go

@@ -12,6 +12,7 @@ import "errors"
 
 type GamePandamasJxData struct {
     Id string
+    Job int32
     Race int32
     Type int32
     Name string
@@ -41,6 +42,7 @@ func (*GamePandamasJxData) GetTypeId() int32 {
 
 func (_v *GamePandamasJxData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = 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["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 } } }