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

bin/json/game_buriedcondi.json

@@ -17049,7 +17049,7 @@
     "NPC": 10081,
     "value": 1,
     "filter": [
-      10010
+      10180
     ],
     "filter2": [
       "剧情ID",
@@ -17073,7 +17073,7 @@
     "NPC": 10082,
     "value": 1,
     "filter": [
-      10010
+      10190
     ],
     "filter2": [
       "剧情ID",
@@ -17594,7 +17594,7 @@
     "NPC": 10294,
     "value": 1,
     "filter": [
-      10030
+      10490
     ],
     "filter2": [
       "剧情ID",
@@ -17659,17 +17659,17 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_755",
-      "text": "剧情ID"
+      "text": "任务战斗"
     },
-    "type": 20001,
+    "type": 70,
     "valid": 0,
     "NPC": 10304,
     "value": 1,
     "filter": [
-      10030
+      180
     ],
     "filter2": [
-      "剧情ID",
+      "通关的关卡ID",
       "0",
       "0",
       "0"
@@ -17785,7 +17785,7 @@
     },
     "type": 43,
     "valid": 0,
-    "NPC": 10354,
+    "NPC": 0,
     "value": 8,
     "filter": [
       3
@@ -17901,7 +17901,7 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_765",
-      "text": "守护者回响解锁次数1次"
+      "text": "主角星座图解锁1次"
     },
     "type": 173,
     "valid": 0,

bin/json/game_worldbattle.json

@@ -297,5 +297,18 @@
       "t": "exp",
       "n": 1009
     }
+  },
+  {
+    "id": 180,
+    "FormatList": [
+      700011
+    ],
+    "BattleReadyID": 100,
+    "EventList": [],
+    "playexp": {
+      "a": "attr",
+      "t": "exp",
+      "n": 1009
+    }
   }
 ]

comm/const.go

@@ -402,7 +402,7 @@ const (
 	Diamond int32 = 2 //钻石
 )
 
-//定时通知类型
+// 定时通知类型
 type NotifyType int32
 
 const (
@@ -467,6 +467,8 @@ const (
 
 	// 主线
 	Reddot24100 ReddotType = 24100 // 主线章节有奖励没领取
+	// 好友
+	Reddot21101 ReddotType = 21101 //当好友申请存在时，一级位置：好友界面左边申请列表图标上右上角位置  当好友申请处理完红点消失
 )
 
 type TaskType int32

comm/imodule.go

@@ -246,6 +246,8 @@ type (
 		UseAssistHero(uid, friendId string) (*pb.DBHero, error)
 		// 切磋结束通知
 		QiecuoFinishNotify(redUid, matchId string) error
+		// 红点
+		IGetReddot
 	}
 
 	//聊天系统

modules/friend/module.go

@@ -198,3 +198,24 @@ func (this *Friend) QiecuoFinishNotify(redUid, matchId string) error {
 	}
 	return nil
 }
+
+func (this *Friend) Reddot(session comm.IUserSession, rid ...comm.ReddotType) (reddot map[comm.ReddotType]bool) {
+	reddot = make(map[comm.ReddotType]bool)
+	friend := this.modelFriend.GetFriend(session.GetUserId())
+	if friend == nil {
+		for _, v := range rid {
+			reddot[v] = false
+		}
+	} else {
+		for _, v := range rid {
+			switch v {
+			case comm.Reddot21101:
+				if len(friend.ApplyIds) > 0 {
+					reddot[comm.Reddot15102] = true
+				}
+			}
+		}
+	}
+
+	return
+}