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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei1dao 2022-11-21 10:09:37 +08:00
commit 232278a86a
4 changed files with 67 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

474
bin/json/game_herolevelup.json
View File

@ -1,774 +1,420 @@
[ [
{ {
"level": 1, "level": 1,
"heroexp": [ "heroexp": 40,
{
"a": "attr",
"t": "heroexp",
"n": 40
}
],
"hp": 1857, "hp": 1857,
"atk": 154, "atk": 154,
"def": 168 "def": 168
}, },
{ {
"level": 2, "level": 2,
"heroexp": [ "heroexp": 80,
{
"a": "attr",
"t": "heroexp",
"n": 80
}
],
"hp": 1953, "hp": 1953,
"atk": 162, "atk": 162,
"def": 177 "def": 177
}, },
{ {
"level": 3, "level": 3,
"heroexp": [ "heroexp": 120,
{
"a": "attr",
"t": "heroexp",
"n": 120
}
],
"hp": 2049, "hp": 2049,
"atk": 170, "atk": 170,
"def": 186 "def": 186
}, },
{ {
"level": 4, "level": 4,
"heroexp": [ "heroexp": 160,
{
"a": "attr",
"t": "heroexp",
"n": 160
}
],
"hp": 2145, "hp": 2145,
"atk": 178, "atk": 178,
"def": 195 "def": 195
}, },
{ {
"level": 5, "level": 5,
"heroexp": [ "heroexp": 200,
{
"a": "attr",
"t": "heroexp",
"n": 200
}
],
"hp": 2241, "hp": 2241,
"atk": 186, "atk": 186,
"def": 203 "def": 203
}, },
{ {
"level": 6, "level": 6,
"heroexp": [ "heroexp": 240,
{
"a": "attr",
"t": "heroexp",
"n": 240
}
],
"hp": 2337, "hp": 2337,
"atk": 194, "atk": 194,
"def": 212 "def": 212
}, },
{ {
"level": 7, "level": 7,
"heroexp": [ "heroexp": 280,
{
"a": "attr",
"t": "heroexp",
"n": 280
}
],
"hp": 2433, "hp": 2433,
"atk": 202, "atk": 202,
"def": 221 "def": 221
}, },
{ {
"level": 8, "level": 8,
"heroexp": [ "heroexp": 320,
{
"a": "attr",
"t": "heroexp",
"n": 320
}
],
"hp": 2529, "hp": 2529,
"atk": 210, "atk": 210,
"def": 229 "def": 229
}, },
{ {
"level": 9, "level": 9,
"heroexp": [ "heroexp": 360,
{
"a": "attr",
"t": "heroexp",
"n": 360
}
],
"hp": 2625, "hp": 2625,
"atk": 218, "atk": 218,
"def": 238 "def": 238
}, },
{ {
"level": 10, "level": 10,
"heroexp": [ "heroexp": 400,
{
"a": "attr",
"t": "heroexp",
"n": 400
}
],
"hp": 2759.4, "hp": 2759.4,
"atk": 229, "atk": 229,
"def": 250 "def": 250
}, },
{ {
"level": 11, "level": 11,
"heroexp": [ "heroexp": 440,
{
"a": "attr",
"t": "heroexp",
"n": 440
}
],
"hp": 2893.8, "hp": 2893.8,
"atk": 241, "atk": 241,
"def": 263 "def": 263
}, },
{ {
"level": 12, "level": 12,
"heroexp": [ "heroexp": 900,
{
"a": "attr",
"t": "heroexp",
"n": 900
}
],
"hp": 3028.2, "hp": 3028.2,
"atk": 252, "atk": 252,
"def": 275 "def": 275
}, },
{ {
"level": 13, "level": 13,
"heroexp": [ "heroexp": 975,
{
"a": "attr",
"t": "heroexp",
"n": 975
}
],
"hp": 3162.6, "hp": 3162.6,
"atk": 263, "atk": 263,
"def": 287 "def": 287
}, },
{ {
"level": 14, "level": 14,
"heroexp": [ "heroexp": 1050,
{
"a": "attr",
"t": "heroexp",
"n": 1050
}
],
"hp": 3297, "hp": 3297,
"atk": 274, "atk": 274,
"def": 299 "def": 299
}, },
{ {
"level": 15, "level": 15,
"heroexp": [ "heroexp": 1125,
{
"a": "attr",
"t": "heroexp",
"n": 1125
}
],
"hp": 3431.4, "hp": 3431.4,
"atk": 285, "atk": 285,
"def": 311 "def": 311
}, },
{ {
"level": 16, "level": 16,
"heroexp": [ "heroexp": 1200,
{
"a": "attr",
"t": "heroexp",
"n": 1200
}
],
"hp": 3565.8, "hp": 3565.8,
"atk": 297, "atk": 297,
"def": 324 "def": 324
}, },
{ {
"level": 17, "level": 17,
"heroexp": [ "heroexp": 1275,
{
"a": "attr",
"t": "heroexp",
"n": 1275
}
],
"hp": 3700.2, "hp": 3700.2,
"atk": 308, "atk": 308,
"def": 336 "def": 336
}, },
{ {
"level": 18, "level": 18,
"heroexp": [ "heroexp": 1350,
{
"a": "attr",
"t": "heroexp",
"n": 1350
}
],
"hp": 3834.6, "hp": 3834.6,
"atk": 319, "atk": 319,
"def": 348 "def": 348
}, },
{ {
"level": 19, "level": 19,
"heroexp": [ "heroexp": 1425,
{
"a": "attr",
"t": "heroexp",
"n": 1425
}
],
"hp": 3969, "hp": 3969,
"atk": 330, "atk": 330,
"def": 360 "def": 360
}, },
{ {
"level": 20, "level": 20,
"heroexp": [ "heroexp": 1500,
{
"a": "attr",
"t": "heroexp",
"n": 1500
}
],
"hp": 4141.8, "hp": 4141.8,
"atk": 345, "atk": 345,
"def": 376 "def": 376
}, },
{ {
"level": 21, "level": 21,
"heroexp": [ "heroexp": 2120,
{
"a": "attr",
"t": "heroexp",
"n": 2120
}
],
"hp": 4314.6, "hp": 4314.6,
"atk": 359, "atk": 359,
"def": 392 "def": 392
}, },
{ {
"level": 22, "level": 22,
"heroexp": [ "heroexp": 2240,
{
"a": "attr",
"t": "heroexp",
"n": 2240
}
],
"hp": 4487.4, "hp": 4487.4,
"atk": 373, "atk": 373,
"def": 407 "def": 407
}, },
{ {
"level": 23, "level": 23,
"heroexp": [ "heroexp": 2380,
{
"a": "attr",
"t": "heroexp",
"n": 2380
}
],
"hp": 4660.2, "hp": 4660.2,
"atk": 388, "atk": 388,
"def": 423 "def": 423
}, },
{ {
"level": 24, "level": 24,
"heroexp": [ "heroexp": 2520,
{
"a": "attr",
"t": "heroexp",
"n": 2520
}
],
"hp": 4833, "hp": 4833,
"atk": 402, "atk": 402,
"def": 439 "def": 439
}, },
{ {
"level": 25, "level": 25,
"heroexp": [ "heroexp": 2680,
{
"a": "attr",
"t": "heroexp",
"n": 2680
}
],
"hp": 5005.8, "hp": 5005.8,
"atk": 417, "atk": 417,
"def": 455 "def": 455
}, },
{ {
"level": 26, "level": 26,
"heroexp": [ "heroexp": 2840,
{
"a": "attr",
"t": "heroexp",
"n": 2840
}
],
"hp": 5178.6, "hp": 5178.6,
"atk": 431, "atk": 431,
"def": 470 "def": 470
}, },
{ {
"level": 27, "level": 27,
"heroexp": [ "heroexp": 3020,
{
"a": "attr",
"t": "heroexp",
"n": 3020
}
],
"hp": 5351.4, "hp": 5351.4,
"atk": 445, "atk": 445,
"def": 486 "def": 486
}, },
{ {
"level": 28, "level": 28,
"heroexp": [ "heroexp": 3200,
{
"a": "attr",
"t": "heroexp",
"n": 3200
}
],
"hp": 5524.2, "hp": 5524.2,
"atk": 460, "atk": 460,
"def": 502 "def": 502
}, },
{ {
"level": 29, "level": 29,
"heroexp": [ "heroexp": 3400,
{
"a": "attr",
"t": "heroexp",
"n": 3400
}
],
"hp": 5697, "hp": 5697,
"atk": 474, "atk": 474,
"def": 517 "def": 517
}, },
{ {
"level": 30, "level": 30,
"heroexp": [ "heroexp": 3600,
{
"a": "attr",
"t": "heroexp",
"n": 3600
}
],
"hp": 5908.2, "hp": 5908.2,
"atk": 492, "atk": 492,
"def": 537 "def": 537
}, },
{ {
"level": 31, "level": 31,
"heroexp": [ "heroexp": 5700,
{
"a": "attr",
"t": "heroexp",
"n": 5700
}
],
"hp": 6119.4, "hp": 6119.4,
"atk": 509, "atk": 509,
"def": 556 "def": 556
}, },
{ {
"level": 32, "level": 32,
"heroexp": [ "heroexp": 6000,
{
"a": "attr",
"t": "heroexp",
"n": 6000
}
],
"hp": 6330.6, "hp": 6330.6,
"atk": 527, "atk": 527,
"def": 575 "def": 575
}, },
{ {
"level": 33, "level": 33,
"heroexp": [ "heroexp": 6330,
{
"a": "attr",
"t": "heroexp",
"n": 6330
}
],
"hp": 6541.8, "hp": 6541.8,
"atk": 545, "atk": 545,
"def": 594 "def": 594
}, },
{ {
"level": 34, "level": 34,
"heroexp": [ "heroexp": 6660,
{
"a": "attr",
"t": "heroexp",
"n": 6660
}
],
"hp": 6753, "hp": 6753,
"atk": 562, "atk": 562,
"def": 613 "def": 613
}, },
{ {
"level": 35, "level": 35,
"heroexp": [ "heroexp": 7020,
{
"a": "attr",
"t": "heroexp",
"n": 7020
}
],
"hp": 6964.2, "hp": 6964.2,
"atk": 580, "atk": 580,
"def": 633 "def": 633
}, },
{ {
"level": 36, "level": 36,
"heroexp": [ "heroexp": 7380,
{
"a": "attr",
"t": "heroexp",
"n": 7380
}
],
"hp": 7175.4, "hp": 7175.4,
"atk": 597, "atk": 597,
"def": 652 "def": 652
}, },
{ {
"level": 37, "level": 37,
"heroexp": [ "heroexp": 7770,
{
"a": "attr",
"t": "heroexp",
"n": 7770
}
],
"hp": 7386.6, "hp": 7386.6,
"atk": 615, "atk": 615,
"def": 671 "def": 671
}, },
{ {
"level": 38, "level": 38,
"heroexp": [ "heroexp": 8160,
{
"a": "attr",
"t": "heroexp",
"n": 8160
}
],
"hp": 7597.8, "hp": 7597.8,
"atk": 633, "atk": 633,
"def": 690 "def": 690
}, },
{ {
"level": 39, "level": 39,
"heroexp": [ "heroexp": 8580,
{
"a": "attr",
"t": "heroexp",
"n": 8580
}
],
"hp": 7809, "hp": 7809,
"atk": 650, "atk": 650,
"def": 709 "def": 709
}, },
{ {
"level": 40, "level": 40,
"heroexp": [ "heroexp": 9000,
{
"a": "attr",
"t": "heroexp",
"n": 9000
}
],
"hp": 8058.6, "hp": 8058.6,
"atk": 671, "atk": 671,
"def": 732 "def": 732
}, },
{ {
"level": 41, "level": 41,
"heroexp": [ "heroexp": 9600,
{
"a": "attr",
"t": "heroexp",
"n": 9600
}
],
"hp": 8308.2, "hp": 8308.2,
"atk": 692, "atk": 692,
"def": 755 "def": 755
}, },
{ {
"level": 42, "level": 42,
"heroexp": [ "heroexp": 10200,
{
"a": "attr",
"t": "heroexp",
"n": 10200
}
],
"hp": 8557.8, "hp": 8557.8,
"atk": 713, "atk": 713,
"def": 777 "def": 777
}, },
{ {
"level": 43, "level": 43,
"heroexp": [ "heroexp": 10800,
{
"a": "attr",
"t": "heroexp",
"n": 10800
}
],
"hp": 8807.4, "hp": 8807.4,
"atk": 733, "atk": 733,
"def": 800 "def": 800
}, },
{ {
"level": 44, "level": 44,
"heroexp": [ "heroexp": 11400,
{
"a": "attr",
"t": "heroexp",
"n": 11400
}
],
"hp": 9057, "hp": 9057,
"atk": 754, "atk": 754,
"def": 823 "def": 823
}, },
{ {
"level": 45, "level": 45,
"heroexp": [ "heroexp": 12000,
{
"a": "attr",
"t": "heroexp",
"n": 12000
}
],
"hp": 9306.6, "hp": 9306.6,
"atk": 775, "atk": 775,
"def": 846 "def": 846
}, },
{ {
"level": 46, "level": 46,
"heroexp": [ "heroexp": 12900,
{
"a": "attr",
"t": "heroexp",
"n": 12900
}
],
"hp": 9556.2, "hp": 9556.2,
"atk": 796, "atk": 796,
"def": 868 "def": 868
}, },
{ {
"level": 47, "level": 47,
"heroexp": [ "heroexp": 13800,
{
"a": "attr",
"t": "heroexp",
"n": 13800
}
],
"hp": 9805.8, "hp": 9805.8,
"atk": 817, "atk": 817,
"def": 891 "def": 891
}, },
{ {
"level": 48, "level": 48,
"heroexp": [ "heroexp": 14700,
{
"a": "attr",
"t": "heroexp",
"n": 14700
}
],
"hp": 10055.4, "hp": 10055.4,
"atk": 837, "atk": 837,
"def": 914 "def": 914
}, },
{ {
"level": 49, "level": 49,
"heroexp": [ "heroexp": 15600,
{
"a": "attr",
"t": "heroexp",
"n": 15600
}
],
"hp": 10305, "hp": 10305,
"atk": 858, "atk": 858,
"def": 936 "def": 936
}, },
{ {
"level": 50, "level": 50,
"heroexp": [ "heroexp": 16500,
{
"a": "attr",
"t": "heroexp",
"n": 16500
}
],
"hp": 10593, "hp": 10593,
"atk": 882, "atk": 882,
"def": 963 "def": 963
}, },
{ {
"level": 51, "level": 51,
"heroexp": [ "heroexp": 23600,
{
"a": "attr",
"t": "heroexp",
"n": 23600
}
],
"hp": 10881, "hp": 10881,
"atk": 906, "atk": 906,
"def": 989 "def": 989
}, },
{ {
"level": 52, "level": 52,
"heroexp": [ "heroexp": 25200,
{
"a": "attr",
"t": "heroexp",
"n": 25200
}
],
"hp": 11169, "hp": 11169,
"atk": 930, "atk": 930,
"def": 1015 "def": 1015
}, },
{ {
"level": 53, "level": 53,
"heroexp": [ "heroexp": 26800,
{
"a": "attr",
"t": "heroexp",
"n": 26800
}
],
"hp": 11457, "hp": 11457,
"atk": 954, "atk": 954,
"def": 1041 "def": 1041
}, },
{ {
"level": 54, "level": 54,
"heroexp": [ "heroexp": 28400,
{
"a": "attr",
"t": "heroexp",
"n": 28400
}
],
"hp": 11745, "hp": 11745,
"atk": 978, "atk": 978,
"def": 1067 "def": 1067
}, },
{ {
"level": 55, "level": 55,
"heroexp": [ "heroexp": 30000,
{
"a": "attr",
"t": "heroexp",
"n": 30000
}
],
"hp": 12033, "hp": 12033,
"atk": 1002, "atk": 1002,
"def": 1093 "def": 1093
}, },
{ {
"level": 56, "level": 56,
"heroexp": [ "heroexp": 32000,
{
"a": "attr",
"t": "heroexp",
"n": 32000
}
],
"hp": 12321, "hp": 12321,
"atk": 1026, "atk": 1026,
"def": 1120 "def": 1120
}, },
{ {
"level": 57, "level": 57,
"heroexp": [ "heroexp": 34000,
{
"a": "attr",
"t": "heroexp",
"n": 34000
}
],
"hp": 12609, "hp": 12609,
"atk": 1050, "atk": 1050,
"def": 1146 "def": 1146
}, },
{ {
"level": 58, "level": 58,
"heroexp": [ "heroexp": 36000,
{
"a": "attr",
"t": "heroexp",
"n": 36000
}
],
"hp": 12897, "hp": 12897,
"atk": 1074, "atk": 1074,
"def": 1172 "def": 1172
}, },
{ {
"level": 59, "level": 59,
"heroexp": [ "heroexp": 38000,
{
"a": "attr",
"t": "heroexp",
"n": 38000
}
],
"hp": 13185, "hp": 13185,
"atk": 1098, "atk": 1098,
"def": 1198 "def": 1198
}, },
{ {
"level": 60, "level": 60,
"heroexp": [], "heroexp": 0,
"hp": 13511.4, "hp": 13511.4,
"atk": 1125, "atk": 1125,
"def": 1228 "def": 1228

2
modules/hero/api_drawCard.go
View File

@ -63,7 +63,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
pool = this.module.modelHero.CheckPool(drawCount, cfgDraw) pool = this.module.modelHero.CheckPool(drawCount, cfgDraw)
drawCount += 1 drawCount += 1
strPool = append(strPool, pool) strPool = append(strPool, pool)
ret := this.module.CheckCondition(session.GetUserId(), req.DrawCount) ret := this.module.CheckCondition(session.GetUserId())
if ret == true { // 命中插入5星英雄 if ret == true { // 命中插入5星英雄
szStar = append(szStar, 5) szStar = append(szStar, 5)
continue continue

7
modules/hero/module.go
View File

@ -458,7 +458,7 @@ func (this *Hero) NoLoginDay(uid string, day int32) {
} }
// 检查充值和未登录天数之内抽卡是否抽中 // 检查充值和未登录天数之内抽卡是否抽中
func (this *Hero) CheckCondition(uid string, drawCount int32) bool { func (this *Hero) CheckCondition(uid string) bool {
var ( var (
curCount int32 curCount int32
update map[string]interface{} update map[string]interface{}
@ -472,16 +472,15 @@ func (this *Hero) CheckCondition(uid string, drawCount int32) bool {
curCount = conf.DrawCardRechargeReward[1] curCount = conf.DrawCardRechargeReward[1]
} }
if v >= curCount { // 触发保底 直接给5星 if v >= curCount { // 触发保底 直接给5星
delete(record.Condition, "recharge") delete(record.Condition, "recharge")
update["condition"] = record.Condition update["condition"] = record.Condition
return true return true
} else { // 1/curCount概率 } else { // 1/curCount概率
n, _ := rand.Int(rand.Reader, big.NewInt(int64(curCount))) n, _ := rand.Int(rand.Reader, big.NewInt(int64(curCount)))
if n.Int64() < 1 { if n.Int64() < 1 {
delete(record.Condition, "recharge") delete(record.Condition, "recharge")
update["condition"] = record.Condition
return true return true
} }
record.Condition["recharge"] += 1 record.Condition["recharge"] += 1
@ -494,12 +493,14 @@ func (this *Hero) CheckCondition(uid string, drawCount int32) bool {
} }
if v >= curCount { // 触发保底 直接给5星 if v >= curCount { // 触发保底 直接给5星
delete(record.Condition, "login") delete(record.Condition, "login")
update["login"] = record.Condition
return true return true
} else { // 1/curCount概率 } else { // 1/curCount概率
n, _ := rand.Int(rand.Reader, big.NewInt(int64(curCount))) n, _ := rand.Int(rand.Reader, big.NewInt(int64(curCount)))
if n.Int64() < 1 { if n.Int64() < 1 {
delete(record.Condition, "login") delete(record.Condition, "login")
update["login"] = record.Condition
return true return true
} }
record.Condition["login"] += 1 record.Condition["login"] += 1

17
sys/configure/structs/game.heroLevelupData.go
View File

@ -12,7 +12,7 @@ import "errors"
type GameHeroLevelupData struct { type GameHeroLevelupData struct {
Level int32 Level int32
Heroexp []*Gameatn Heroexp int32
Hp float32 Hp float32
Atk float32 Atk float32
Def float32 Def float32
@ -26,20 +26,7 @@ func (*GameHeroLevelupData) GetTypeId() int32 {
func (_v *GameHeroLevelupData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameHeroLevelupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
{ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) }
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["heroexp"].([]interface{}); !_ok_ { err = errors.New("heroexp error"); return }
_v.Heroexp = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ 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 = DeserializeGameatn(_x_); err != nil { return } }
_v.Heroexp = append(_v.Heroexp, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) }