update
This commit is contained in:
parent
b0b2c7bc12
commit
af5c089189
@ -15,9 +15,9 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"model": "",
|
||||
"controller": "",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -47,9 +47,9 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"model": "",
|
||||
"controller": "",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -111,9 +111,9 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"model": "",
|
||||
"controller": "",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -143,9 +143,9 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"model": "",
|
||||
"controller": "",
|
||||
"point": "",
|
||||
"etime": 0,
|
||||
"stime": 0,
|
||||
"hp": 0,
|
||||
@ -175,7 +175,7 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"model": "54102_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"etime": 50,
|
||||
@ -207,7 +207,7 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"model": "54103_1",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"etime": 0,
|
||||
@ -239,7 +239,7 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"model": "54103_2",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"etime": 0,
|
||||
@ -271,7 +271,7 @@
|
||||
"access": [
|
||||
166
|
||||
],
|
||||
"model": "54101_3",
|
||||
"model": "54103_3",
|
||||
"controller": "Person/mount/10000M_54101.controller",
|
||||
"point": "Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/peoplepos",
|
||||
"etime": 45,
|
||||
|
||||
@ -744,6 +744,9 @@
|
||||
"buzkashi_goalscore": 5,
|
||||
"buzkashi_goalteamscore": 10,
|
||||
"buzkashi_bumpdis": 5,
|
||||
"buzkashi_hpbumpdis": 5,
|
||||
"buzkashi_hpbumpscore": 5,
|
||||
"buzkashi_hpbumphp": 100,
|
||||
"buzkashi_recovertime": 2000,
|
||||
"buzkashi_recoverHp": 1,
|
||||
"buzkashi_deathspeed": 800,
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
{
|
||||
"a": "mts",
|
||||
"t": "20030001",
|
||||
"n": 1
|
||||
"n": 21
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -58,5 +58,25 @@
|
||||
"n": 10
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "359",
|
||||
"var": [
|
||||
{
|
||||
"a": "mts",
|
||||
"t": "20030002",
|
||||
"n": 21
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": "360",
|
||||
"var": [
|
||||
{
|
||||
"a": "mts",
|
||||
"t": "20030003",
|
||||
"n": 1
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -17800,7 +17800,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133001311_1",
|
||||
"text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]以及2回合[color=#e5621b]防御下降[/color]状态。"
|
||||
"text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]状态。"
|
||||
},
|
||||
"buffid": [
|
||||
390001106,
|
||||
@ -18952,7 +18952,7 @@
|
||||
"passSkill": [],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_113005111_1",
|
||||
"text": "攻击1个敌方，伤害为自身攻击力300%提升至自身25%行动值。"
|
||||
"text": "攻击1个敌方，伤害为自身攻击力300%，提升自身25%行动值。"
|
||||
},
|
||||
"buffid": [],
|
||||
"map": ""
|
||||
@ -19618,7 +19618,9 @@
|
||||
224009313
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
224009313
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124009311_1",
|
||||
"text": "云朵先生为自身附加2回合[color=#37d8a9]暴击提升[/color]效果，之后对敌方目标造成3次自身攻击力150%的伤害，若此次伤害触发了暴击，则有40%的概率[color=#e5621b]冰冻[/color]目标，持续1回合。"
|
||||
@ -19653,7 +19655,9 @@
|
||||
224009313
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
224009313
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124009311_2",
|
||||
"text": "伤害提升至165%。"
|
||||
@ -19688,7 +19692,9 @@
|
||||
224009313
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
224009313
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124009311_3",
|
||||
"text": "伤害提升至180%。"
|
||||
@ -19723,7 +19729,9 @@
|
||||
224009313
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
224009313
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124009311_4",
|
||||
"text": "伤害提升至195%。"
|
||||
@ -19758,7 +19766,9 @@
|
||||
224009313
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
224009313
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_124009311_5",
|
||||
"text": "伤害提升至210%。"
|
||||
@ -20318,7 +20328,9 @@
|
||||
"key": "skill_skill_atk_Desc_151006211_1",
|
||||
"text": "对敌方发起3次攻击，造成攻击力300%的伤害。"
|
||||
},
|
||||
"buffid": [],
|
||||
"buffid": [
|
||||
390001107
|
||||
],
|
||||
"map": ""
|
||||
},
|
||||
{
|
||||
@ -20566,10 +20578,12 @@
|
||||
233002213
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
233002213
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133002211_1",
|
||||
"text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力120%的伤害，有30%概率将自身1个减益状态转移给目标。若触发暴击额外附加2回合【流血】状态"
|
||||
"text": "坦克对敌方1个目标发起3段攻击，每段可造成攻击力120%的伤害，有30%概率将自身1个减益状态转移给目标。若触发暴击额外附加2回合[color=#e5621b]流血[/color]状态"
|
||||
},
|
||||
"buffid": [
|
||||
390001430
|
||||
@ -20599,13 +20613,15 @@
|
||||
233002213
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
233002213
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133002211_2",
|
||||
"text": "伤害提升至130%。"
|
||||
},
|
||||
"buffid": [
|
||||
390001431
|
||||
390001430
|
||||
],
|
||||
"map": ""
|
||||
},
|
||||
@ -20632,13 +20648,15 @@
|
||||
233002213
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
233002213
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133002211_3",
|
||||
"text": "伤害提升至140%。"
|
||||
},
|
||||
"buffid": [
|
||||
390001432
|
||||
390001430
|
||||
],
|
||||
"map": ""
|
||||
},
|
||||
@ -20665,13 +20683,15 @@
|
||||
233002213
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
233002213
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133002211_4",
|
||||
"text": "伤害提升至150%。"
|
||||
},
|
||||
"buffid": [
|
||||
390001433
|
||||
390001430
|
||||
],
|
||||
"map": ""
|
||||
},
|
||||
@ -20698,13 +20718,15 @@
|
||||
233002213
|
||||
]
|
||||
},
|
||||
"passSkill": [],
|
||||
"passSkill": [
|
||||
233002213
|
||||
],
|
||||
"Desc": {
|
||||
"key": "skill_skill_atk_Desc_133002211_5",
|
||||
"text": "伤害提升至165%。"
|
||||
},
|
||||
"buffid": [
|
||||
390001434
|
||||
390001430
|
||||
],
|
||||
"map": ""
|
||||
},
|
||||
|
||||
@ -1253,7 +1253,7 @@
|
||||
"Priority": 0,
|
||||
"NotOverlay": 0,
|
||||
"OverlayTimes": 1,
|
||||
"SameID": false,
|
||||
"SameID": true,
|
||||
"golbalbufficon": "",
|
||||
"buffIcon": "ty_icon_buff_fs",
|
||||
"buffeffect": "effect_34002_skill_1_hit_1",
|
||||
|
||||
@ -1702,8 +1702,8 @@
|
||||
"Id": 424009011,
|
||||
"When": 10,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "3",
|
||||
"MainSkillCheck": "",
|
||||
"TargetCheck": "Target=3",
|
||||
"MainSkillCheck": "MainSkillID=124009111",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"DpsCheck": "",
|
||||
@ -8310,7 +8310,8 @@
|
||||
"MaxEmitTimes": 0,
|
||||
"MaxEmitTimesInRound": 0,
|
||||
"Callback": [
|
||||
913003315
|
||||
913003315,
|
||||
913003316
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -8568,17 +8569,17 @@
|
||||
"Type": "CallSkillPas",
|
||||
"MaxEmitTimesInRoundByRole": 0,
|
||||
"MaxEmitTimes": 0,
|
||||
"MaxEmitTimesInRound": 0,
|
||||
"MaxEmitTimesInRound": 1,
|
||||
"Callback": [
|
||||
934008313
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 493500231,
|
||||
"When": 16,
|
||||
"When": 20,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "Target=2",
|
||||
"MainSkillCheck": "MainSkillID=135002311",
|
||||
"MainSkillCheck": "SkillPos=3",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"DpsCheck": "",
|
||||
@ -8618,7 +8619,7 @@
|
||||
"When": 20,
|
||||
"FromCheck": "Target=3",
|
||||
"TargetCheck": "",
|
||||
"MainSkillCheck": "MainSkillID=135006311",
|
||||
"MainSkillCheck": "SkillPos=3",
|
||||
"AfterSkillCheck": "",
|
||||
"BuffCheck": "",
|
||||
"DpsCheck": "",
|
||||
|
||||
@ -121,8 +121,6 @@ type (
|
||||
|
||||
// 充值了多少钱
|
||||
RechargeMoney(uid string, money int32)
|
||||
// 多少天没登录
|
||||
NoLoginDay(uid string, day int32)
|
||||
|
||||
// 拥有N个X级英雄
|
||||
CheckLvNum(uid string, lv int32) int32
|
||||
|
||||
@ -46,10 +46,6 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
|
||||
//同意的好友
|
||||
agreeIds := []string{}
|
||||
for _, friendId := range req.FriendIds {
|
||||
// 验证friendId是否有效
|
||||
if _, err = this.module.ModuleUser.GetUser(friendId); err != nil {
|
||||
continue
|
||||
}
|
||||
if _, ok := utils.Find(self.FriendIds, friendId); !ok {
|
||||
//不在好友列表中就加入
|
||||
agreeIds = append(agreeIds, friendId)
|
||||
|
||||
@ -113,10 +113,7 @@ func (this *PushGiftbag) BuriedsNotify(session comm.IUserSession, condis []*pb.C
|
||||
this.Errorln(err)
|
||||
return
|
||||
}
|
||||
if _, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil {
|
||||
this.Error("no found user!", log.Field{Key: "uid", Value: session.GetUserId()})
|
||||
return
|
||||
}
|
||||
|
||||
if info, err = this.model.getUserPushGift(session.GetUserId()); err != nil {
|
||||
this.Errorln(err)
|
||||
return
|
||||
|
||||
@ -20,17 +20,6 @@ func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpR
|
||||
return
|
||||
}
|
||||
|
||||
_, err := this.module.GetUser(session.GetUserId())
|
||||
|
||||
if err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_UserSessionNobeing,
|
||||
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
update := map[string]interface{}{
|
||||
"bgp": req.BgpId,
|
||||
}
|
||||
|
||||
@ -17,9 +17,6 @@ type GameMainStageData struct {
|
||||
PreviousGroupId []int32
|
||||
Previoustage int32
|
||||
Episodetype int32
|
||||
IsNear int32
|
||||
Openlevel int32
|
||||
EditorStage int32
|
||||
Venturemodelspeed float32
|
||||
Venturemodelscale float32
|
||||
MoveType int32
|
||||
@ -28,6 +25,9 @@ type GameMainStageData struct {
|
||||
Venturetype int32
|
||||
Ventureavatar []string
|
||||
SceneEffectfilter string
|
||||
IsNear int32
|
||||
Openlevel int32
|
||||
EditorStage int32
|
||||
Herocolor int32
|
||||
Heroimg string
|
||||
Bubbletext string
|
||||
@ -85,9 +85,6 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["is_near"].(float64); !_ok_ { err = errors.New("is_near error"); return }; _v.IsNear = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["openlevel"].(float64); !_ok_ { err = errors.New("openlevel error"); return }; _v.Openlevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EditorStage"].(float64); !_ok_ { err = errors.New("EditorStage error"); return }; _v.EditorStage = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelspeed"].(float64); !_ok_ { err = errors.New("venturemodelspeed error"); return }; _v.Venturemodelspeed = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["venturemodelscale"].(float64); !_ok_ { err = errors.New("venturemodelscale error"); return }; _v.Venturemodelscale = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["move_type"].(float64); !_ok_ { err = errors.New("move_type error"); return }; _v.MoveType = int32(_tempNum_) }
|
||||
@ -109,6 +106,9 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
}
|
||||
|
||||
{ var _ok_ bool; if _v.SceneEffectfilter, _ok_ = _buf["scene_effectfilter"].(string); !_ok_ { err = errors.New("scene_effectfilter error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["is_near"].(float64); !_ok_ { err = errors.New("is_near error"); return }; _v.IsNear = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["openlevel"].(float64); !_ok_ { err = errors.New("openlevel error"); return }; _v.Openlevel = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EditorStage"].(float64); !_ok_ { err = errors.New("EditorStage error"); return }; _v.EditorStage = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["herocolor"].(float64); !_ok_ { err = errors.New("herocolor error"); return }; _v.Herocolor = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Heroimg, _ok_ = _buf["heroimg"].(string); !_ok_ { err = errors.New("heroimg error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["bubbletext"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Bubbletext error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Bubbletext, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
|
||||
@ -249,6 +249,9 @@ type GameGlobalData struct {
|
||||
BuzkashiGoalscore int32
|
||||
BuzkashiGoalteamscore int32
|
||||
BuzkashiBumpdis float32
|
||||
BuzkashiHpbumpdis float32
|
||||
BuzkashiHpbumpscore int32
|
||||
BuzkashiHpbumphp int32
|
||||
BuzkashiRecovertime int32
|
||||
BuzkashiRecoverHp int32
|
||||
BuzkashiDeathspeed int32
|
||||
@ -1016,6 +1019,9 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalscore error"); return }; _v.BuzkashiGoalscore = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalteamscore"].(float64); !_ok_ { err = errors.New("buzkashi_goalteamscore error"); return }; _v.BuzkashiGoalteamscore = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_hpbumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_hpbumpdis error"); return }; _v.BuzkashiHpbumpdis = float32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_hpbumpscore"].(float64); !_ok_ { err = errors.New("buzkashi_hpbumpscore error"); return }; _v.BuzkashiHpbumpscore = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_hpbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_hpbumphp error"); return }; _v.BuzkashiHpbumphp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathspeed"].(float64); !_ok_ { err = errors.New("buzkashi_deathspeed error"); return }; _v.BuzkashiDeathspeed = int32(_tempNum_) }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user