配置同步

bin/json/game_activityshow.json

@@ -1,34 +1,57 @@
 [
+  {
+    "key": 0,
+    "show": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 1
+      }
+    ]
+  },
   {
     "key": 1001,
-    "show": {
+    "show": [
+      {
         "a": "item",
         "t": "23000001",
         "n": 0
       }
+    ]
   },
   {
     "key": 1003,
-    "show": {
+    "show": [
+      {
         "a": "item",
         "t": "23000002",
         "n": 0
       }
+    ]
   },
   {
     "key": 1004,
-    "show": {
+    "show": [
+      {
         "a": "item",
         "t": "23000003",
         "n": 0
       }
+    ]
   },
   {
     "key": 1005,
-    "show": {
+    "show": [
+      {
         "a": "item",
         "t": "23000004",
         "n": 0
       }
+    ]
   }
 ]

bin/json/game_battleready.json

@@ -9,6 +9,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -33,6 +37,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -57,6 +65,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -81,6 +93,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -105,6 +121,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -129,6 +149,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -153,6 +177,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -177,6 +205,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -201,6 +233,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -225,6 +261,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -249,6 +289,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -273,6 +317,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -297,6 +345,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -321,6 +373,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -345,6 +401,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -369,6 +429,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -393,6 +457,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -417,6 +485,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -441,6 +513,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -465,6 +541,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -489,6 +569,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -513,6 +597,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -537,6 +625,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -561,6 +653,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -585,6 +681,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 1,
@@ -609,6 +709,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 1,
@@ -633,6 +737,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -657,6 +765,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -681,6 +793,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 1,
@@ -705,6 +821,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -729,6 +849,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -755,6 +879,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -781,6 +909,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -807,6 +939,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -831,6 +967,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -855,6 +995,10 @@
     ],
     "HideAlienSpace": 0,
     "ShowBuff": 1,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [
       14
     ],
@@ -881,6 +1025,10 @@
     ],
     "HideAlienSpace": 1,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -907,6 +1055,10 @@
     ],
     "HideAlienSpace": 1,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,
@@ -936,6 +1088,10 @@
     ],
     "HideAlienSpace": 1,
     "ShowBuff": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
     "battleEvents": [],
     "ScoreGroupID": 0,
     "disableAiCamera": 0,

bin/json/game_monsterformat.json

@@ -325,7 +325,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -345,7 +345,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -625,7 +625,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -645,7 +645,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -665,7 +665,7 @@
     "captainId": 1,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -685,7 +685,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 51014,
+    "heroid": 51004,
     "star": 3,
     "equip": [],
     "newskill": [],

bin/json/game_stonebattle.json

@@ -9,7 +9,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101011
+      500101
     ],
     "RewardLottery": 21141101
   },
@@ -23,7 +23,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101012
+      500201
     ],
     "RewardLottery": 21141101
   },
@@ -37,7 +37,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101013
+      500301
     ],
     "RewardLottery": 21141101
   },
@@ -51,7 +51,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101021
+      500401
     ],
     "RewardLottery": 21141101
   },
@@ -65,7 +65,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101051
+      500601
     ],
     "RewardLottery": 21141101
   },
@@ -79,7 +79,7 @@
     "EffreValue": 0,
     "BattleReadyID": 118,
     "FormatList": [
-      101061
+      500701
     ],
     "RewardLottery": 21141101
   }

sys/configure/structs/Game.BattleReadyData.go

@@ -18,6 +18,7 @@ type GameBattleReadyData struct {
     BattleScenes []string
     HideAlienSpace int32
     ShowBuff int32
+    RuleTips string
     BattleEvents []int32
     ScoreGroupID int32
     DisableAiCamera int32
@@ -60,6 +61,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ShowBuff"].(float64); !_ok_ { err = errors.New("ShowBuff error"); return }; _v.ShowBuff = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
      {
                 var _arr_ []interface{}
                 var _ok_ bool