liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

配置同步

Browse Source
This commit is contained in:
meixiongfeng 2023-04-21 19:13:44 +08:00
parent 2e4511feef
commit 3daf164bcb
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/json/game_global.json
View File

@ -716,7 +716,6 @@
"n": 1000 "n": 1000
} }
], ],
<<<<<<< HEAD
"buzkashi_resurrection": 10, "buzkashi_resurrection": 10,
"favorability_attenuation": [ "favorability_attenuation": [
{ {
@ -732,8 +731,5 @@
"v": 500 "v": 500
} }
] ]
=======
"buzkashi_resurrection": 10
>>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
} }
] ]

2
bin/json/game_skillbuff.json
View File

@ -476,7 +476,7 @@
"SameID": false, "SameID": false,
"golbalbufficon": "", "golbalbufficon": "",
"buffIcon": "ty_zd_buff_j008", "buffIcon": "ty_zd_buff_j008",
"buffeffect": "effect_jiaoxia_jiaobing", "buffeffect": "effect_buff_bingdong",
"buffpos": "脚底" "buffpos": "脚底"
}, },
{ {

6
sys/configure/structs/game.globalData.go
View File

@ -222,10 +222,7 @@ type GameGlobalData struct {
BuzkashiVintegral []*Gameatn BuzkashiVintegral []*Gameatn
BuzkashiFintegral []*Gameatn BuzkashiFintegral []*Gameatn
BuzkashiResurrection int32 BuzkashiResurrection int32
<<<<<<< HEAD
FavorabilityAttenuation []*Gamekv FavorabilityAttenuation []*Gamekv
=======
>>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
} }
const TypeId_GameGlobalData = 477542761 const TypeId_GameGlobalData = 477542761
@ -914,7 +911,6 @@ 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 _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) }
<<<<<<< HEAD
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool
@ -929,8 +925,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
} }
} }
=======
>>>>>>> 2ff92487cf513d980124f84c7fe3db1e6bb88e31
return return
} }