配置同步

bin/json/game_activereward.json

@@ -5,9 +5,9 @@
     "active": 40,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60001",
-        "n": 10
+        "n": 1
       }
     ],
     "action": "Skill_2",
@@ -19,9 +19,9 @@
     "active": 80,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60002",
-        "n": 10
+        "n": 2
       }
     ],
     "action": "Skill_2",
@@ -33,9 +33,9 @@
     "active": 120,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60003",
-        "n": 20
+        "n": 3
       }
     ],
     "action": "Skill_2",
@@ -47,9 +47,9 @@
     "active": 160,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60003",
-        "n": 10
+        "n": 4
       }
     ],
     "action": "Skill_2",

bin/json/game_global.json

@@ -720,6 +720,20 @@
         "n": 1000
       }
     ],
-    "buzkashi_resurrection": 10
+    "buzkashi_resurrection": 10,
+    "favorability_attenuation": [
+      {
+        "k": 3,
+        "v": 1000
+      },
+      {
+        "k": 6,
+        "v": 800
+      },
+      {
+        "k": 9,
+        "v": 500
+      }
+    ]
   }
 ]

bin/json/game_rdtaskcondi.json

@@ -3075,8 +3075,8 @@
     "id": 3012001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3012001",
-      "text": ""
+      "text": "使用好友助战英雄"
     },
     "type": 12,
     "valid": 0,
@@ -3091,8 +3091,8 @@
     "id": 3018001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3018001",
-      "text": ""
+      "text": "累计普通招募"
     },
     "type": 18,
     "valid": 0,
@@ -3123,8 +3123,8 @@
     "id": 3047001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3047001",
-      "text": ""
+      "text": "累计强化装备"
     },
     "type": 47,
     "valid": 0,
@@ -3155,8 +3155,8 @@
     "id": 3064001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3064001",
-      "text": ""
+      "text": "购买任意商品"
     },
     "type": 64,
     "valid": 0,
@@ -3187,8 +3187,8 @@
     "id": 3105001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3105001",
-      "text": ""
+      "text": "刷新商店"
     },
     "type": 105,
     "valid": 0,
@@ -3203,8 +3203,8 @@
     "id": 3104001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3104001",
-      "text": ""
+      "text": "消费钻石"
     },
     "type": 104,
     "valid": 0,
@@ -3219,8 +3219,8 @@
     "id": 3130001,
     "type_sp": 0,
     "tasktxt": {
-      "key": "",
+      "key": "task_taskcond_tasktxt_3013001",
-      "text": ""
+      "text": "进行竞技场"
     },
     "type": 130,
     "valid": 0,

bin/json/game_rdtasknpc.json

@@ -214,7 +214,7 @@
     "heroid": 24004,
     "datas": [
       "WuGuanScene",
-      "20050_邦尼兔_1",
+      "20020_邦尼兔_1",
       "137"
     ],
     "event": [
@@ -242,7 +242,7 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "20010_熊猫_1",
+      "20010_熊猫_2",
       "901"
     ],
     "event": [

bin/json/game_skillafteratk.json

@@ -11568,8 +11568,8 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 4,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 4,
     "Type": 1,
     "Argu": [
       1,
@@ -11593,7 +11593,7 @@
     "From": 2,
     "Where": [],
     "Order": "",
-    "Limit": 10,
+    "Limit": 4,
     "ExecuteCnt": 1,
     "Type": 3,
     "Argu": [
@@ -15557,12 +15557,12 @@
     "Where": [],
     "Order": "",
     "Limit": 1,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 5,
     "Type": 1,
     "Argu": [
       1,
       4,
-      1100
+      200
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -15578,7 +15578,7 @@
     "EmitPR": 1000,
     "From": 1,
     "Where": [],
-    "Order": "",
+    "Order": "PropertyUp=3",
     "Limit": 1,
     "ExecuteCnt": 1,
     "Type": 3,

bin/json/game_taskactivereward.json

@@ -5,9 +5,9 @@
     "active": 40,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60001",
-        "n": 10
+        "n": 1
       }
     ],
     "action": "Skill_2",
@@ -19,9 +19,9 @@
     "active": 80,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60002",
-        "n": 10
+        "n": 2
       }
     ],
     "action": "Skill_2",
@@ -33,9 +33,9 @@
     "active": 120,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60003",
-        "n": 20
+        "n": 3
       }
     ],
     "action": "Skill_2",
@@ -47,9 +47,9 @@
     "active": 160,
     "reword": [
       {
-        "a": "attr",
+        "a": "item",
-        "t": "diamond",
+        "t": "60003",
-        "n": 10
+        "n": 4
       }
     ],
     "action": "Skill_2",

bin/json/game_taskround.json

@@ -12,7 +12,13 @@
     "id_after": 0,
     "jump_interface": 107,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   },
   {
     "key": 20002,
@@ -27,7 +33,13 @@
     "id_after": 0,
     "jump_interface": 103,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   },
   {
     "key": 20003,
@@ -42,7 +54,13 @@
     "id_after": 0,
     "jump_interface": 102,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ]
   },
   {
     "key": 20004,
@@ -57,7 +75,13 @@
     "id_after": 0,
     "jump_interface": 122,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   },
   {
     "key": 20005,
@@ -72,7 +96,13 @@
     "id_after": 0,
     "jump_interface": 113,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   },
   {
     "key": 20006,
@@ -87,7 +117,13 @@
     "id_after": 0,
     "jump_interface": 122,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   },
   {
     "key": 20007,
@@ -102,7 +138,13 @@
     "id_after": 0,
     "jump_interface": 122,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ]
   },
   {
     "key": 20008,
@@ -117,6 +159,12 @@
     "id_after": 0,
     "jump_interface": 156,
     "icon": "wp_icon_0001",
-    "reword": []
+    "reword": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 10
+      }
+    ]
   }
 ]

sys/configure/structs/Game.Favorability.go

@@ -9,34 +9,26 @@
 package cfg
 
 type GameFavorability struct {
-    _dataMap map[int32]*GameFavorabilityData
     _dataList []*GameFavorabilityData
 }
 
 func NewGameFavorability(_buf []map[string]interface{}) (*GameFavorability, error) {
 	_dataList := make([]*GameFavorabilityData, 0, len(_buf))
-	dataMap := make(map[int32]*GameFavorabilityData)
 	for _, _ele_ := range _buf {
 		if _v, err2 := DeserializeGameFavorabilityData(_ele_); err2 != nil {
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Id] = _v
 		}
 	}
-	return &GameFavorability{_dataList:_dataList, _dataMap:dataMap}, nil
+	return &GameFavorability{_dataList:_dataList}, nil
-}
-
-func (table *GameFavorability) GetDataMap() map[int32]*GameFavorabilityData {
-    return table._dataMap
 }
 
 func (table *GameFavorability) GetDataList() []*GameFavorabilityData {
     return table._dataList
 }
 
-func (table *GameFavorability) Get(key int32) *GameFavorabilityData {
+func (table *GameFavorability) Get(index int) *GameFavorabilityData {
-    return table._dataMap[key]
+    return table._dataList[index]
 }
 
-

sys/configure/structs/game.globalData.go

@@ -222,6 +222,7 @@ type GameGlobalData struct {
     BuzkashiVintegral []*Gameatn
     BuzkashiFintegral []*Gameatn
     BuzkashiResurrection int32
+    FavorabilityAttenuation []*Gamekv
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -910,6 +911,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
             }
 
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["favorability_attenuation"].([]interface{}); !_ok_ { err = errors.New("favorability_attenuation error"); return }
+
+                _v.FavorabilityAttenuation = make([]*Gamekv, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Gamekv
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGamekv(_x_); err != nil { return } }
+                    _v.FavorabilityAttenuation = append(_v.FavorabilityAttenuation, _list_v_)
+                }
+            }
+
     return
 }