配置同步

bin/json/game_battleready.json

@@ -1750,7 +1750,7 @@
       "scenesfight_09"
     ],
     "BGMusic": "",
-    "LoadingId": 0,
+    "LoadingId": 1031,
     "HideAlienSpace": 0,
     "HideFightUI": 0,
     "RuleTips": {
@@ -1785,7 +1785,7 @@
       "scenesfight_09"
     ],
     "BGMusic": "",
-    "LoadingId": 0,
+    "LoadingId": 1031,
     "HideAlienSpace": 0,
     "HideFightUI": 0,
     "RuleTips": {
@@ -1820,7 +1820,7 @@
       "scenesfight_09"
     ],
     "BGMusic": "",
-    "LoadingId": 0,
+    "LoadingId": 1031,
     "HideAlienSpace": 0,
     "HideFightUI": 0,
     "RuleTips": {
@@ -1857,7 +1857,7 @@
       "scenesfight_09"
     ],
     "BGMusic": "",
-    "LoadingId": 0,
+    "LoadingId": 1031,
     "HideAlienSpace": 0,
     "HideFightUI": 0,
     "RuleTips": {

bin/json/game_buzkashitrack.json

@@ -196,7 +196,7 @@
     "track": 2,
     "type": 0,
     "startPos": 18,
-    "endPos": 20,
+    "endPos": 19,
     "local": 1
   },
   {
@@ -204,7 +204,7 @@
     "track": 2,
     "type": 0,
     "startPos": 18,
-    "endPos": 20,
+    "endPos": 19,
     "local": 0
   },
   {
@@ -212,7 +212,7 @@
     "track": 2,
     "type": 0,
     "startPos": 18,
-    "endPos": 20,
+    "endPos": 19,
     "local": 2
   }
 ]

bin/json/game_cardpool.json

@@ -2,7 +2,7 @@
   {
     "key": 1,
     "card_pool_type": "inevitable_20001",
-    "id": "24004",
+    "id": "25001",
     "weight": 1000
   },
   {

bin/json/game_guide.json

@@ -469,8 +469,86 @@
     "parameter": "",
     "interface": "",
     "condition": "",
-    "followtj": "OpenFight",
+    "followtj": "",
     "followguide": 1000307,
+    "finger": [
+      "battleready",
+      "herolist$",
+      "1"
+    ],
+    "offset": {
+      "x": 0,
+      "y": 0
+    },
+    "fingerTime": 0.3,
+    "objSize": {
+      "x": 0,
+      "y": 0
+    },
+    "objOffset": {
+      "x": 0,
+      "y": 0
+    },
+    "txt": "1000107",
+    "speakerface": 0,
+    "sound": "",
+    "mask": 0,
+    "lock": 0,
+    "uishow": 0,
+    "skiptime": 5000,
+    "skip": 0,
+    "skipgroup": 0,
+    "reward": []
+  },
+  {
+    "id": 1000307,
+    "group": 3,
+    "type": 3,
+    "startPar": "",
+    "parameter": "",
+    "interface": "",
+    "condition": "",
+    "followtj": "",
+    "followguide": 1000308,
+    "finger": [
+      "battleready",
+      "rolelist$",
+      "1"
+    ],
+    "offset": {
+      "x": 0,
+      "y": 0
+    },
+    "fingerTime": 0.3,
+    "objSize": {
+      "x": 0,
+      "y": 0
+    },
+    "objOffset": {
+      "x": 0,
+      "y": 0
+    },
+    "txt": "",
+    "speakerface": 0,
+    "sound": "",
+    "mask": 0,
+    "lock": 0,
+    "uishow": 0,
+    "skiptime": 5000,
+    "skip": 0,
+    "skipgroup": 0,
+    "reward": []
+  },
+  {
+    "id": 1000308,
+    "group": 3,
+    "type": 3,
+    "startPar": "",
+    "parameter": "",
+    "interface": "",
+    "condition": "",
+    "followtj": "OpenFight",
+    "followguide": 1000309,
     "finger": [
       "battleready",
       "btn_start$",
@@ -501,7 +579,7 @@
     "reward": []
   },
   {
-    "id": 1000307,
+    "id": 1000309,
     "group": 3,
     "type": 1,
     "startPar": "",
@@ -509,7 +587,7 @@
     "interface": "",
     "condition": "",
     "followtj": "",
-    "followguide": 1000308,
+    "followguide": 1000310,
     "finger": [
       "zhandou",
       "battleactionaxis.herolist$.n2"
@@ -539,7 +617,7 @@
     "reward": []
   },
   {
-    "id": 1000308,
+    "id": 1000310,
     "group": 3,
     "type": 1,
     "startPar": "",
@@ -547,7 +625,7 @@
     "interface": "",
     "condition": "",
     "followtj": "",
-    "followguide": 1000309,
+    "followguide": 1000311,
     "finger": [
       "GRoot",
       "FloatRoot.InfoRoot.roleinfo_2100.campicon"
@@ -577,7 +655,7 @@
     "reward": []
   },
   {
-    "id": 1000309,
+    "id": 1000311,
     "group": 3,
     "type": 3,
     "startPar": "",

bin/json/game_loading.json

@@ -298,5 +298,15 @@
       "key": "loading_Sheet1_prompt_30",
       "text": "守护与被守护，永远是相互的。"
     }
+  },
+  {
+    "id": 1031,
+    "scene": "scenesfight_09",
+    "image": "ld_mh_bg_tjp",
+    "icon": "loading_icon_fc",
+    "prompt": {
+      "key": "loading_Sheet1_prompt_31",
+      "text": "伟大守护者的第一次成就，往往是一场看似平平无奇的战斗。"
+    }
   }
 ]

bin/json/game_mail.json

@@ -5,6 +5,7 @@
       "key": "mail_mail_title_1",
       "text": "俱乐部解散"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_1",
       "text": "通知："
@@ -26,6 +27,7 @@
       "key": "mail_mail_title_2",
       "text": "移出俱乐部"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_2",
       "text": "通知："
@@ -47,6 +49,7 @@
       "key": "mail_mail_title_3",
       "text": "加入俱乐部"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_3",
       "text": "通知："
@@ -68,6 +71,7 @@
       "key": "mail_mail_title_4",
       "text": "奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_4",
       "text": "亲爱的玩家："
@@ -89,6 +93,7 @@
       "key": "mail_mail_title_5",
       "text": "奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_5",
       "text": "亲爱的玩家："
@@ -110,6 +115,7 @@
       "key": "mail_mail_title_6",
       "text": "赛季塔排行奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_6",
       "text": "亲爱的玩家："
@@ -131,6 +137,7 @@
       "key": "mail_mail_title_7",
       "text": "竞技场排行奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_7",
       "text": "亲爱的玩家："
@@ -152,6 +159,7 @@
       "key": "mail_mail_title_8",
       "text": "商队挂机奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_8",
       "text": "亲爱的玩家："
@@ -173,6 +181,7 @@
       "key": "mail_mail_title_9",
       "text": "vip奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_9",
       "text": "亲爱的{0}："
@@ -194,6 +203,7 @@
       "key": "mail_mail_title_10",
       "text": "好友木桩驱赶邮件"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_10",
       "text": "亲爱的玩家："
@@ -215,17 +225,18 @@
       "key": "mail_mail_title_11",
       "text": "欢迎"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_11",
-      "text": "亲爱的玩家："
+      "text": "各位新老顾客朋友们："
     },
     "content": {
       "key": "mail_mail_content_11",
-      "text": "欢迎来到梦工场世界！以下是一点礼品，请笑纳。"
+      "text": "为了庆祝胜利，老爹的面摊推出“豆花拌面”活动！吃面送豆花！多吃多送！先到先得！送完即止！<br>鹅老爹独家秘制汤头，劲道阳春面，尽在平家面馆！欢迎各位新老顾客前来品尝！"
     },
     "sender": {
       "key": "mail_mail_sender_11",
-      "text": "系统"
+      "text": "\u00A0鹅爹"
     },
     "reword": [
       {
@@ -257,6 +268,7 @@
       "key": "mail_mail_title_12",
       "text": "排名奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_12",
       "text": "亲爱的{0}："
@@ -278,6 +290,7 @@
       "key": "mail_mail_title_13",
       "text": "结算奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_13",
       "text": "亲爱的{0}："
@@ -299,6 +312,7 @@
       "key": "mail_mail_title_14",
       "text": "俱乐部演练击杀奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_14",
       "text": "亲爱的{0}："
@@ -320,6 +334,7 @@
       "key": "mail_mail_title_15",
       "text": "俱乐部演练排名奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_15",
       "text": "亲爱的{0}："
@@ -341,6 +356,7 @@
       "key": "mail_mail_title_16",
       "text": ""
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_16",
       "text": "亲爱的{0}："
@@ -362,6 +378,7 @@
       "key": "mail_mail_title_17",
       "text": "转盘活动奖励转换"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_17",
       "text": "亲爱的{0}："
@@ -383,6 +400,7 @@
       "key": "mail_mail_title_18",
       "text": "商队等级奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_18",
       "text": "亲爱的{0}："
@@ -404,6 +422,7 @@
       "key": "mail_mail_title_19",
       "text": "商队进度奖励"
     },
+    "postmark": "yj_icon_yc_mfjl",
     "recipient": {
       "key": "mail_mail_recipient_19",
       "text": "亲爱的{0}："

bin/json/game_rdtasknpc.json

@@ -659,6 +659,47 @@
     ],
     "goto": 0
   },
+  {
+    "id": 200351,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "支线-烹饪处的阿宝",
+      "901"
+    ],
+    "event": [
+      2,
+      10010
+    ],
+    "goto": 0
+  },
+  {
+    "id": 200358,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "901"
+    ],
+    "event": [],
+    "goto": 0
+  },
+  {
+    "id": 200359,
+    "heroid": 25001,
+    "Levelid": 0,
+    "datas": [
+      "GameMain",
+      "支线-烹饪处的阿宝",
+      "901"
+    ],
+    "event": [
+      2,
+      10010
+    ],
+    "goto": 0
+  },
   {
     "id": 100421,
     "heroid": 35002,

sys/configure/structs/Game.MailData.go

@@ -13,6 +13,7 @@ import "errors"
 type GameMailData struct {
     Id string
     Title string
+    Postmark string
     Recipient string
     Content string
     Sender string
@@ -29,6 +30,7 @@ func (*GameMailData) GetTypeId() int32 {
 func (_v *GameMailData)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 __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["title"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Title error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Title, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Postmark, _ok_ = _buf["postmark"].(string); !_ok_ { err = errors.New("postmark error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["recipient"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Recipient error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Recipient, _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["content"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Content error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Content, _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["sender"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Sender error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Sender, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }