update

2023-09-05 09:27:45 +08:00 · 2023-09-05 09:27:45 +08:00 · 94a6ebefc4
commit 94a6ebefc4
parent 93a9e850e4
10 changed files with 169 additions and 60 deletions
--- a/bin/json/game_buzkashifm.json
+++ b/bin/json/game_buzkashifm.json
@ -32,7 +32,7 @@
  {
    "num": 4,
    "type": 3,
-    "stime": "射门成功",
+    "stime": "抓羊成功",
    "broadcast": {
      "key": "buzkashi_buzkashi_fm_broadcast_4",
      "text": "完美的配合！"
@ -42,7 +42,7 @@
  {
    "num": 5,
    "type": 4,
-    "stime": "射门失败",
+    "stime": "抓羊失败",
    "broadcast": {
      "key": "buzkashi_buzkashi_fm_broadcast_5",
      "text": "这招太狠了，希望没有人受伤"
@ -52,16 +52,6 @@
  {
    "num": 6,
    "type": 5,
-    "stime": "使用药剂",
-    "broadcast": {
-      "key": "buzkashi_buzkashi_fm_broadcast_6",
-      "text": "大放异彩！"
-    },
-    "icon": ""
-  },
-  {
-    "num": 7,
-    "type": 6,
    "stime": "团队冲刺",
    "broadcast": {
      "key": "buzkashi_buzkashi_fm_broadcast_7",
@ -70,8 +60,8 @@
    "icon": ""
  },
  {
-    "num": 8,
-    "type": 7,
+    "num": 7,
+    "type": 6,
    "stime": "死亡",
    "broadcast": {
      "key": "buzkashi_buzkashi_fm_broadcast_8",
@ -80,19 +70,9 @@
    "icon": ""
  },
  {
-    "num": 9,
-    "type": 8,
-    "stime": "使用道具",
-    "broadcast": {
-      "key": "buzkashi_buzkashi_fm_broadcast_9",
-      "text": "大放异彩！"
-    },
-    "icon": ""
-  },
-  {
-    "num": 10,
-    "type": 9,
-    "stime": "射门时",
+    "num": 8,
+    "type": 7,
+    "stime": "投羊",
    "broadcast": {
      "key": "buzkashi_buzkashi_fm_broadcast_10",
      "text": "完美的配合！"
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@ -740,6 +740,7 @@
    "buzkashi_sendtime": 1000,
    "buzkashi_speedbumptime": 3000,
    "buzkashi_speedbumphp": 1,
+    "buzkashi_sprintbumpscore": 10,
    "buzkashi_bumpdis": 5,
    "buzkashi_recovertime": 2000,
    "buzkashi_recoverHp": 1,
--- a/bin/json/game_heroawaken.json
+++ b/bin/json/game_heroawaken.json
@ -1003,7 +1003,7 @@
    "skill": 913005432,
    "describe": {
      "key": "hero_awaken_describe_28",
-      "text": "每次释放三技能时自身行动条增加10%"
+      "text": "每次释放三技能时自身行动值增加10%"
    },
    "icon": "js_jx_img_icon06",
    "condition": 0,
@ -10859,7 +10859,7 @@
    "skill": 934008433,
    "describe": {
      "key": "hero_awaken_describe_282",
-      "text": "三技能额外造成2段伤害并同样附加10%行动条吸收"
+      "text": "三技能额外造成2段伤害并同样附加10%行动值吸收"
    },
    "icon": "js_jx_img_icon04",
    "condition": 0,
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@ -6772,7 +6772,9 @@
      1,
      1000
    ],
-    "FollowSK": [],
+    "FollowSK": [
+      215005314
+    ],
    "SucFollowSK": [],
    "FailFollowSK": [],
    "MustHit": false,
@ -56589,7 +56591,9 @@
    "Id": 913003315,
    "EmitPR": 1000,
    "From": 3,
-    "Where": [],
+    "Where": [
+      "SelfHpproGreater=50"
+    ],
    "Order": "",
    "Limit": 1,
    "ExecuteCnt": 1,
@ -56599,7 +56603,9 @@
      2,
      50
    ],
-    "FollowSK": [],
+    "FollowSK": [
+      913003316
+    ],
    "SucFollowSK": [],
    "FailFollowSK": [],
    "MustHit": false,
@ -56616,11 +56622,9 @@
    "Order": "",
    "Limit": 1,
    "ExecuteCnt": 1,
-    "Type": 11,
+    "Type": 24,
    "Argu": [
-      2,
-      2,
-      50
+      500
    ],
    "FollowSK": [],
    "SucFollowSK": [],
@ -57558,10 +57562,10 @@
    "ExecuteCnt": 1,
    "Type": 3,
    "Argu": [
-      391000008,
+      390001554,
      1000,
      1,
-      1
+      -1
    ],
    "FollowSK": [],
    "SucFollowSK": [],
@ -58288,7 +58292,7 @@
  {
    "Id": 914005313,
    "EmitPR": 1000,
-    "From": 3,
+    "From": 12,
    "Where": [],
    "Order": "",
    "Limit": 10,
@ -58661,17 +58665,16 @@
  {
    "Id": 913005311,
    "EmitPR": 1000,
-    "From": 1,
+    "From": 3,
    "Where": [],
    "Order": "",
    "Limit": 10,
    "ExecuteCnt": 1,
-    "Type": 3,
+    "Type": 2,
    "Argu": [
-      390001001,
-      1000,
-      1,
-      1
+      491300532,
+      -1,
+      -1
    ],
    "FollowSK": [],
    "SucFollowSK": [],
@ -58685,6 +58688,30 @@
  {
    "Id": 913005312,
    "EmitPR": 1000,
+    "From": 1,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "Type": 3,
+    "Argu": [
+      390001001,
+      1000,
+      0,
+      1
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 913005313,
+    "EmitPR": 1000,
    "From": 3,
    "Where": [],
    "Order": "",
@ -58704,7 +58731,7 @@
    "RevisiParams": []
  },
  {
-    "Id": 913005313,
+    "Id": 913005314,
    "EmitPR": 1000,
    "From": 3,
    "Where": [],
@ -58727,17 +58754,15 @@
    "RevisiParams": []
  },
  {
-    "Id": 913005314,
+    "Id": 913005315,
    "EmitPR": 1000,
-    "From": 1,
+    "From": 12,
    "Where": [],
    "Order": "",
    "Limit": 10,
    "ExecuteCnt": 1,
    "Type": 15,
    "Argu": [
-      0,
-      -1,
      1,
      -1,
      2,
@ -59001,7 +59026,7 @@
    "Type": 3,
    "Argu": [
      391000000,
-      100,
+      1000,
      1,
      -1
    ],
@ -59025,7 +59050,7 @@
    "Type": 3,
    "Argu": [
      391000013,
-      100,
+      1000,
      1,
      -1
    ],
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@ -37939,8 +37939,7 @@
    "Target": 0,
    "ChildSkill": {
      "Id": [
-        913003315,
-        913003316
+        913003315
      ]
    },
    "passSkill": [],
@ -38271,7 +38270,7 @@
    "Target": 0,
    "ChildSkill": {
      "Id": [
-        913005312
+        913005313
      ]
    },
    "passSkill": [],
@ -38301,10 +38300,12 @@
    "Target": 0,
    "ChildSkill": {
      "Id": [
-        913005313
+        913005314
      ]
    },
-    "passSkill": [],
+    "passSkill": [
+      913005314
+    ],
    "Desc": {
      "key": "skill_skill_atk_Desc_913005433_1",
      "text": "3技能添加攻击提升时若目标身上已有攻击提升效果，减少目标所有技能冷却1回合"
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@ -8957,7 +8957,7 @@
    },
    "BuffType": 102,
    "EffectArgu": [
-      23,
+      5,
      10,
      400
    ],
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@ -7464,7 +7464,7 @@
  {
    "Id": 491500232,
    "When": 16,
-    "FromCheck": "",
+    "FromCheck": "Target=3",
    "TargetCheck": "Target=2",
    "MainSkillCheck": "MainSkillID=1150025311",
    "AfterSkillCheck": "",
@ -8089,5 +8089,25 @@
      1000,
      914008314
    ]
+  },
+  {
+    "Id": 491300532,
+    "When": 20,
+    "FromCheck": "Target=3",
+    "TargetCheck": "Target=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "SkillID=213005311",
+    "BuffCheck": "",
+    "DpsCheck": "",
+    "AddCon": [],
+    "PasPr": 1000,
+    "PasCorrection": 0,
+    "Type": "CallSkillPas",
+    "MaxEmitTimesInRoundByRole": 0,
+    "MaxEmitTimes": 0,
+    "MaxEmitTimesInRound": 0,
+    "Callback": [
+      913005312
+    ]
  }
 ]
--- a/modules/robot/modulerobot_hero.go
+++ b/modules/robot/modulerobot_hero.go
@ -74,7 +74,7 @@ func (this *ModuleRobot_Hero) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskDa
 			return
 		}

-	case comm.Rtype199:
+	case comm.Rtype199, comm.Rtype39, comm.Rtype40:
 		req := &pb.HeroTalentLearnReq{
 			TalentID: 0,
 			ObjId:    "",
@ -215,6 +215,7 @@ func (this *ModuleRobot_Hero) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskDa
 			err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 			return
 		}
+
 	}
 	return
 }
--- a/modules/robot/modulerobot_smithy.go
+++ b/modules/robot/modulerobot_smithy.go
@ -0,0 +1,79 @@
+package robot
+
+import (
+	"errors"
+	"fmt"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+
+	"google.golang.org/protobuf/proto"
+)
+
+//用户模块 机器人
+type ModuleRobot_Smithy struct {
+	smithy *pb.DBStove
+}
+
+func (this *ModuleRobot_Smithy) Init() (err error) {
+	this.smithy = &pb.DBStove{
+		Id:          "",
+		Uid:         "",
+		Lv:          0,
+		Data:        map[int32]*pb.Mastery{},
+		Skill:       map[int32]int32{},
+		Forge:       map[int32]int32{},
+		Temperature: 0,
+		RecoveTime:  0,
+		Hit:         map[int32]int32{},
+	}
+	return
+}
+
+//接收到消息
+func (this *ModuleRobot_Smithy) Receive(robot IRobot, stype string, message proto.Message) (err error) {
+	switch stype {
+	case "list":
+		resp := message.(*pb.SmithyGetStoveInfoResp)
+		this.smithy = resp.Data
+		break
+	}
+	return
+}
+
+//机器人执行流
+func (this *ModuleRobot_Smithy) DoPipeline(robot IRobot) (err error) {
+	var (
+		errdata *pb.ErrorData
+	)
+	if _, errdata = robot.SendMessage("smithy", "getstoveinfo", &pb.SmithyGetStoveInfoReq{}); errdata != nil {
+		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
+		return
+	}
+	return
+}
+
+//做任务
+func (this *ModuleRobot_Smithy) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskData, condconf *cfg.GameBuriedCondiData) (err error) {
+	var (
+		errdata *pb.ErrorData
+	)
+	switch comm.TaskType(condconf.Type) {
+	case comm.Rtype51:
+		// 在铁匠铺中获得xx件xx星装备
+		if _, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "hero", "drawcard",
+			&pb.SmithyForgeEquipReq{
+				ReelId:   condconf.Filter[0],
+				Lava:     0,
+				Quality:  0,
+				SuiteId:  0,
+				Position: 0,
+				Hit:      map[int32]int32{},
+				Count:    1,
+			}); errdata != nil {
+			err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
+			return
+		}
+	}
+	return
+}
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@ -245,6 +245,7 @@ type GameGlobalData struct {
    BuzkashiSendtime int32
    BuzkashiSpeedbumptime int32
    BuzkashiSpeedbumphp int32
+    BuzkashiSprintbumpscore int32
    BuzkashiBumpdis float32
    BuzkashiRecovertime int32
    BuzkashiRecoverHp int32
@ -1007,6 +1008,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_sendtime"].(float64); !_ok_ { err = errors.New("buzkashi_sendtime error"); return }; _v.BuzkashiSendtime = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumphp error"); return }; _v.BuzkashiSpeedbumphp = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_sprintbumpscore"].(float64); !_ok_ { err = errors.New("buzkashi_sprintbumpscore error"); return }; _v.BuzkashiSprintbumpscore = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) }