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

2023-11-29 09:55:04 +08:00 · 2023-11-29 09:55:04 +08:00 · b7ad57c357
commit b7ad57c357
parent 5aa06fb0e9 84a147fad9
8 changed files with 73 additions and 13 deletions
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@ -24785,7 +24785,7 @@
    "type_sp": 1,
    "tasktxt": {
      "key": "buried_buried_condi_tasktxt_744",
-      "text": "前往博客岛"
+      "text": "前往博克岛"
    },
    "type": 61,
    "valid": 1,
@ -24848,7 +24848,7 @@
    "type_sp": 1,
    "tasktxt": {
      "key": "buried_buried_condi_tasktxt_746",
-      "text": "在博客岛找到龙之花"
+      "text": "在博克岛找到龙之花"
    },
    "type": 61,
    "valid": 1,
--- a/bin/json/game_effect.json
+++ b/bin/json/game_effect.json
@ -7,6 +7,10 @@
    "key": "character_move_fast_2",
    "path": "Effect/Character/effect_character_move_fast_2.prefab"
  },
+  {
+    "key": "effect_character_move_fast_2_1",
+    "path": "Effect/Character/effect_character_move_fast_2_1.prefab"
+  },
  {
    "key": "character_move_arrow",
    "path": "Effect/Character/effect_character_move_arrow.prefab"
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@ -225,16 +225,16 @@
    "layer": 0,
    "name": {
      "key": "gamesummary_fathernode_name_14",
-      "text": "小游戏合集"
+      "text": "冒险回顾"
    },
    "mapPos": {
-      "x": -1121,
+      "x": -1021,
      "y": 583
    },
    "scale": 0.4,
    "usetext": {
      "key": "gamesummary_fathernode_usetext_14",
-      "text": "小游戏合集"
+      "text": "那冒险中曾遇见的小小挑战，如今再次回到身边，想去试试吗？"
    }
  }
 ]
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@ -13138,6 +13138,50 @@
    "RevisiCondition": "",
    "RevisiParams": []
  },
+  {
+    "Id": 245001115,
+    "EmitPR": 1000,
+    "From": 4,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 8,
+    "Argu": [
+      3,
+      1,
+      750
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 245001116,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "Type": 12,
+    "Argu": [
+      250
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
  {
    "Id": 245001211,
    "EmitPR": 1000,
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@ -887,7 +887,7 @@
    },
    "task_details": {
      "key": "worldtask_world_task_task_details_20",
-      "text": "埃雷特竟然背叛了！还掠走了岛上所有的龙，他究竟为何站在了阴影战士那边？！"
+      "text": "埃雷特竟然背叛了！还掠走了岛上所有的龙，他究竟为何站在了黑暗掠夺者那边？！"
    },
    "npctxt": {
      "key": "worldtask_world_task_npctxt_20",
@ -929,7 +929,7 @@
    },
    "task_details": {
      "key": "worldtask_world_task_task_details_21",
-      "text": "一定要找到埃雷特，阻止阴影战士的阴谋！但所有的龙都被掠走，可要如何寻找？"
+      "text": "一定要找到埃雷特，阻止黑暗掠夺者的阴谋！但所有的龙都被掠走，可要如何寻找？"
    },
    "npctxt": {
      "key": "worldtask_world_task_npctxt_21",
@ -1009,15 +1009,15 @@
    "icon": "25001",
    "task_name": {
      "key": "worldtask_world_task_task_name_23",
-      "text": "追击阴影战士"
+      "text": "追击黑暗掠夺者"
    },
    "task_details": {
      "key": "worldtask_world_task_task_details_23",
-      "text": "埃雷特也有他的苦衷，但他的行为我们依然不能原谅。如果阴影战士的目的是复活漆黑，那必须得赶快阻止他！"
+      "text": "埃雷特也有他的苦衷，但他的行为我们依然不能原谅。如果黑暗掠夺者的目的是复活漆黑，那必须得赶快阻止他！"
    },
    "npctxt": {
      "key": "worldtask_world_task_npctxt_23",
-      "text": "追击阴影战士"
+      "text": "追击黑暗掠夺者"
    },
    "get_item": [],
    "trigger": 0,
@ -1055,7 +1055,7 @@
    },
    "task_details": {
      "key": "worldtask_world_task_task_details_24",
-      "text": "这一切竟都是阴影战士设的局？对手虽然是神之造物，但我们不能放弃！"
+      "text": "这一切竟都是黑暗掠夺者设的局？对手虽然是神之造物，但我们不能放弃！"
    },
    "npctxt": {
      "key": "worldtask_world_task_npctxt_24",
@ -1097,7 +1097,7 @@
    },
    "task_details": {
      "key": "worldtask_world_task_task_details_25",
-      "text": "阴影战士的阴谋被摧毁，是时候将这个喜讯告诉博客岛的村民们了！"
+      "text": "黑暗掠夺者的阴谋被摧毁，是时候将这个喜讯告诉博客岛的村民们了！"
    },
    "npctxt": {
      "key": "worldtask_world_task_npctxt_25",
@ -1193,7 +1193,7 @@
    "completetask": [
      120701214
    ],
-    "deliver_npc": 10108,
+    "deliver_npc": 0,
    "taskend_removeitem": [],
    "auto_accept": 2,
    "tasktips": 0,
--- a/sys/configure/structs/Game.GuideData.go
+++ b/sys/configure/structs/Game.GuideData.go
@ -27,6 +27,7 @@ type GameGuideData struct {
    ObjSize serialization.Vector2
    ObjOffset serialization.Vector2
    Txt string
+    Txtoffset serialization.Vector2
    Speakerface int32
    Sound string
    Mask int32
@ -91,6 +92,13 @@ func (_v *GameGuideData)Deserialize(_buf map[string]interface{}) (err error) {
            }

    { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } }
+    { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["txtoffset"].(map[string]interface{}); !_ok_ { err = errors.New("txtoffset error"); return }
+            var _x_, _y_ float32;
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+            { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+            _v.Txtoffset = serialization.NewVector2(_x_, _y_)
+            }
+
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) }
    { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mask"].(float64); !_ok_ { err = errors.New("mask error"); return }; _v.Mask = int32(_tempNum_) }
--- a/sys/configure/structs/Game.MainStageData.go
+++ b/sys/configure/structs/Game.MainStageData.go
@ -39,6 +39,7 @@ type GameMainStageData struct {
    Heroimg string
    Bubbletext string
    Animation []string
+    Prewarbubbletext string
    Hide int32
    Destroy int32
    Progress int32
@ -166,6 +167,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
                }
            }

+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prewarbubbletext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prewarbubbletext error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prewarbubbletext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hide"].(float64); !_ok_ { err = errors.New("hide error"); return }; _v.Hide = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["destroy"].(float64); !_ok_ { err = errors.New("destroy error"); return }; _v.Destroy = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["progress"].(float64); !_ok_ { err = errors.New("progress error"); return }; _v.Progress = int32(_tempNum_) }
--- a/sys/configure/structs/Game.WorldTaskData.go
+++ b/sys/configure/structs/Game.WorldTaskData.go
@ -33,6 +33,7 @@ type GameWorldTaskData struct {
    AutoAccept int32
    Tasktips int32
    DeliverTask int32
+    DeliverTaskNpc int32
    LockAdd int32
    Finish []int32
    Finishparameter string
@ -109,6 +110,7 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["auto_accept"].(float64); !_ok_ { err = errors.New("auto_accept error"); return }; _v.AutoAccept = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tasktips"].(float64); !_ok_ { err = errors.New("tasktips error"); return }; _v.Tasktips = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task"].(float64); !_ok_ { err = errors.New("deliver_task error"); return }; _v.DeliverTask = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deliver_task_npc"].(float64); !_ok_ { err = errors.New("deliver_task_npc error"); return }; _v.DeliverTaskNpc = int32(_tempNum_) }
    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock_add"].(float64); !_ok_ { err = errors.New("lock_add error"); return }; _v.LockAdd = int32(_tempNum_) }
     {
                var _arr_ []interface{}