Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
This commit is contained in:
sk
commit
07d8de615e
|
|
@ -211,128 +211,135 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
GainWay_NewPlayer int32 = 0 //新建角色
|
GainWay_NewPlayer int32 = 0 //新建角色
|
||||||
GainWay_Pay = 1 //后台增加(主要是充值)
|
GainWay_Pay = 1 //后台增加(主要是充值)
|
||||||
GainWay_ByPMCmd = 2 //pm命令
|
GainWay_ByPMCmd = 2 //pm命令
|
||||||
GainWay_MatchBreakBack = 3 //退赛退还
|
GainWay_MatchBreakBack = 3 //退赛退还
|
||||||
GainWay_MatchSystemSupply = 4 //比赛奖励
|
GainWay_MatchSystemSupply = 4 //比赛奖励
|
||||||
GainWay_Exchange = 5 //兑换
|
GainWay_Exchange = 5 //兑换
|
||||||
GainWay_ServiceFee = 6 //桌费
|
GainWay_ServiceFee = 6 //桌费
|
||||||
GainWay_CoinSceneWin = 7 //金豆场赢取
|
GainWay_CoinSceneWin = 7 //金豆场赢取
|
||||||
GainWay_CoinSceneLost = 8 //金豆场输
|
GainWay_CoinSceneLost = 8 //金豆场输
|
||||||
GainWay_CoinSceneEnter = 9 //进入金币场预扣
|
GainWay_CoinSceneEnter = 9 //进入金币场预扣
|
||||||
GainWay_ShopBuy = 10 //商城购买或者兑换
|
GainWay_ShopBuy = 10 //商城购买或者兑换
|
||||||
GainWay_CoinSceneLeave = 11 //金豆场回兑
|
GainWay_CoinSceneLeave = 11 //金豆场回兑
|
||||||
GainWay_HundredSceneWin = 12 //万人场赢取
|
GainWay_HundredSceneWin = 12 //万人场赢取
|
||||||
GainWay_HundredSceneLost = 13 //万人场输
|
GainWay_HundredSceneLost = 13 //万人场输
|
||||||
GainWay_MessageAttach = 14 //邮件
|
GainWay_MessageAttach = 14 //邮件
|
||||||
GainWay_SafeBoxSave = 15 //保险箱存入
|
GainWay_SafeBoxSave = 15 //保险箱存入
|
||||||
GainWay_SafeBoxTakeOut = 16 //保险箱取出
|
GainWay_SafeBoxTakeOut = 16 //保险箱取出
|
||||||
GainWay_Fishing = 17 //捕鱼
|
GainWay_Fishing = 17 //捕鱼
|
||||||
GainWay_CoinSceneExchange = 18 //金豆场兑换
|
GainWay_CoinSceneExchange = 18 //金豆场兑换
|
||||||
GainWay_UpgradeAccount = 19 //升级账号
|
GainWay_UpgradeAccount = 19 //升级账号
|
||||||
GainWay_API_AddCoin = 20 //API操作钱包
|
GainWay_API_AddCoin = 20 //API操作钱包
|
||||||
GainWay_GoldCome = 21 //财神降临
|
GainWay_GoldCome = 21 //财神降临
|
||||||
GainWay_Transfer_System2Thrid = 22 //系统平台转入到第三方平台的金币
|
GainWay_Transfer_System2Thrid = 22 //系统平台转入到第三方平台的金币
|
||||||
GainWay_Transfer_Thrid2System = 23 //第三方平台转入到系统平台的金币
|
GainWay_Transfer_Thrid2System = 23 //第三方平台转入到系统平台的金币
|
||||||
GainWay_RebateTask = 24 //返利获取
|
GainWay_RebateTask = 24 //返利获取
|
||||||
GainWay_IOSINSTALLSTABLE = 25 //ios安装奖励
|
GainWay_IOSINSTALLSTABLE = 25 //ios安装奖励
|
||||||
GainWay_VirtualChange = 26 //德州虚拟账变
|
GainWay_VirtualChange = 26 //德州虚拟账变
|
||||||
GainWay_CreatePrivateScene = 27 //创建私有房间
|
GainWay_CreatePrivateScene = 27 //创建私有房间
|
||||||
GainWay_PrivateSceneReturn = 28 //解散私有房间返还
|
GainWay_PrivateSceneReturn = 28 //解散私有房间返还
|
||||||
GainWay_OnlineRandCoin = 29 //红包雨
|
GainWay_OnlineRandCoin = 29 //红包雨
|
||||||
GainWay_Expire = 30 //到期清理
|
GainWay_Expire = 30 //到期清理
|
||||||
GainWay_PromoterBind = 31 //手动绑定推广员
|
GainWay_PromoterBind = 31 //手动绑定推广员
|
||||||
GainWay_GradeShopReturn = 32 //积分商城撤单退还积分
|
GainWay_GradeShopReturn = 32 //积分商城撤单退还积分
|
||||||
GainWay_Api_In = 33 //转移金币
|
GainWay_Api_In = 33 //转移金币
|
||||||
GainWay_Api_Out = 34 //转移金币
|
GainWay_Api_Out = 34 //转移金币
|
||||||
GainWay_Shop_Buy = 35 //购买记录
|
GainWay_Shop_Buy = 35 //购买记录
|
||||||
GainWay_MAIL_MTEM = 36 //邮件领取道具
|
GainWay_MAIL_MTEM = 36 //邮件领取道具
|
||||||
GainWay_Item_Sale = 37 //道具出售
|
GainWay_Item_Sale = 37 //道具出售
|
||||||
GainWay_ReliefFund = 38 //领取救济金
|
GainWay_ReliefFund = 38 //领取救济金
|
||||||
GainWay_Shop_Revoke = 39 //撤单
|
GainWay_Shop_Revoke = 39 //撤单
|
||||||
GainWay_ActSign = 40 //
|
GainWay_ActSign = 40 //
|
||||||
GainWay_MatchSignup = 41 //比赛报名费用
|
GainWay_MatchSignup = 41 //比赛报名费用
|
||||||
GainWay_MatchSeason = 42 //比赛赛季奖励
|
GainWay_MatchSeason = 42 //比赛赛季奖励
|
||||||
GainWay_ActSignNew = 43 //新签到
|
GainWay_ActSignNew = 43 //新签到
|
||||||
GainWay_ActTurnplate = 44 //轮盘
|
GainWay_ActTurnplate = 44 //轮盘
|
||||||
GainWay_ActBlindBox = 45 //盲盒
|
GainWay_ActBlindBox = 45 //盲盒
|
||||||
GainWay_ActFirstPay = 46 //首充
|
GainWay_ActFirstPay = 46 //首充
|
||||||
GainWay_VIPGift = 47 //vip礼包
|
GainWay_VIPGift = 47 //vip礼包
|
||||||
GainWay_ActContinuousPay = 48 //连续充值
|
GainWay_ActContinuousPay = 48 //连续充值
|
||||||
GainWay_ActJybAward = 49 //礼包码兑换
|
GainWay_ActJybAward = 49 //礼包码兑换
|
||||||
GainWay_LeaveDeduct = 50 //离开扣分
|
GainWay_LeaveDeduct = 50 //离开扣分
|
||||||
GainWay_LeaveCombat = 51 //离开补偿
|
GainWay_LeaveCombat = 51 //离开补偿
|
||||||
GainWay_RankMatch = 52 //排位赛段位奖励
|
GainWay_RankMatch = 52 //排位赛段位奖励
|
||||||
GainWay_AddBag = 53 //增加背包接口调用
|
GainWay_AddBag = 53 //增加背包接口调用
|
||||||
GainWay_SmallRocket = 54 //小火箭收入
|
GainWay_SmallRocket = 54 //小火箭收入
|
||||||
GainWay_BindTel = 55 //绑定手机号
|
GainWay_BindTel = 55 //绑定手机号
|
||||||
GainWay_ReliefFund2 = 56 //救济金看视频双倍领取
|
GainWay_ReliefFund2 = 56 //救济金看视频双倍领取
|
||||||
GainWay_ActTurnplate2 = 57 //轮盘看视频双倍领取
|
GainWay_ActTurnplate2 = 57 //轮盘看视频双倍领取
|
||||||
GainWay_ActSignNew2 = 58 //签到看视频双倍领取
|
GainWay_ActSignNew2 = 58 //签到看视频双倍领取
|
||||||
GainWay_ItemUse = 59 //道具使用
|
GainWay_ItemUse = 59 //道具使用
|
||||||
GainWay_PhoneScore = 60 //手机积分活动
|
GainWay_PhoneScore = 60 //手机积分活动
|
||||||
GainWay_RankReward = 61 //排位奖励
|
GainWay_RankReward = 61 //排位奖励
|
||||||
GainWay_TaskReward = 62 //任务奖励
|
GainWay_TaskReward = 62 //任务奖励
|
||||||
GainWay_Interact = 63 //房间内互动效果
|
GainWay_Interact = 63 //房间内互动效果
|
||||||
GainWayItemCollectExchange = 64 //集卡活动兑换
|
GainWayItemCollectExchange = 64 //集卡活动兑换
|
||||||
GainWay_WeekCardAward = 65 //周卡奖励
|
GainWay_WeekCardAward = 65 //周卡奖励
|
||||||
GainWay_PigrankTakeCoin = 66 //存钱罐领取耗费钻石
|
GainWay_PigrankTakeCoin = 66 //存钱罐领取耗费钻石
|
||||||
GainWay_PigrankGainCoin = 67 //存钱罐打开获取金币
|
GainWay_PigrankGainCoin = 67 //存钱罐打开获取金币
|
||||||
GainWay_ItemMove = 68 //道具赠送
|
GainWay_ItemMove = 68 //道具赠送
|
||||||
GainWay_RoleUpgrade = 69 //角色升级
|
GainWay_RoleUpgrade = 69 //角色升级
|
||||||
GainWay_PetUpgrade = 70 //宠物升级
|
GainWay_PetUpgrade = 70 //宠物升级
|
||||||
GainWay_Game = 71 //游戏掉落
|
GainWay_Game = 71 //游戏掉落
|
||||||
GainWayItemCollectLogin = 73 //集卡活动登录
|
GainWayItemCollectLogin = 73 //集卡活动登录
|
||||||
GainWay_Collect = 74 //集卡活动
|
GainWay_Collect = 74 //集卡活动
|
||||||
GainWayItemPhoneScoreExchange = 75 //抽手机活动兑换
|
GainWayItemPhoneScoreExchange = 75 //抽手机活动兑换
|
||||||
GainWayItemTaskInvite = 78 //邀请任务
|
GainWayItemTaskInvite = 78 //邀请任务
|
||||||
GainWayItemTaskNewPlayer = 79 //新手任务
|
GainWayItemTaskNewPlayer = 79 //新手任务
|
||||||
GainWayItemTaskAchievement = 80 //成就任务
|
GainWayItemTaskAchievement = 80 //成就任务
|
||||||
GainWayItemTaskEveryDay = 81 //每日任务
|
GainWayItemTaskEveryDay = 81 //每日任务
|
||||||
GainWayItemWeekActive = 82 //周活跃奖励
|
GainWayItemWeekActive = 82 //周活跃奖励
|
||||||
GainWayContinueSign = 83 //累计签到
|
GainWayContinueSign = 83 //累计签到
|
||||||
GainWayBackend = 84 // 后台操作
|
GainWayBackend = 84 // 后台操作
|
||||||
GainWayBuyCoin = 85 // 商城购买金币
|
GainWayBuyCoin = 85 // 商城购买金币
|
||||||
GainWayBuyItem = 86 // 商城购买道具
|
GainWayBuyItem = 86 // 商城购买道具
|
||||||
GainWayBuyWeekCard = 87 // 商城购买周卡
|
GainWayBuyWeekCard = 87 // 商城购买周卡
|
||||||
GainWayVipBuyCoin = 88 // vip商城购买金币
|
GainWayVipBuyCoin = 88 // vip商城购买金币
|
||||||
GainWaySign7Con = 89 // 累计签到进阶奖励消耗
|
GainWaySign7Con = 89 // 累计签到进阶奖励消耗
|
||||||
GainWay_PigrankGainDiamond = 90 //存钱罐打开获取钻石
|
GainWay_PigrankGainDiamond = 90 //存钱罐打开获取钻石
|
||||||
GainWaySign7Add = 91 // 累计签到进阶奖励获得
|
GainWaySign7Add = 91 // 累计签到进阶奖励获得
|
||||||
GainWayItemChange = 92 //背包内使用道具兑换话费
|
GainWayItemChange = 92 //背包内使用道具兑换话费
|
||||||
GainWayPetSkillLevelUp = 93 //宠物技能升级
|
GainWayPetSkillLevelUp = 93 //宠物技能升级
|
||||||
GainWayPermitAward = 94 // 赛季通行证等级奖励
|
GainWayPermitAward = 94 // 赛季通行证等级奖励
|
||||||
GainWayItemPermitRank = 95 // 赛季通行证排行奖励
|
GainWayItemPermitRank = 95 // 赛季通行证排行奖励
|
||||||
GainWayPermitExchangeCost = 96 // 赛季通行证兑换消耗
|
GainWayPermitExchangeCost = 96 // 赛季通行证兑换消耗
|
||||||
GainWayPermitExchangeGain = 97 // 赛季通行证兑换获得
|
GainWayPermitExchangeGain = 97 // 赛季通行证兑换获得
|
||||||
GainWayItemTaskPermit = 98 // 赛季通行证任务
|
GainWayItemTaskPermit = 98 // 赛季通行证任务
|
||||||
GainWayDiamondLottery = 99 //钻石抽奖
|
GainWayDiamondLottery = 99 //钻石抽奖
|
||||||
GainWaySkinUnLock = 100 // 皮肤解锁消耗
|
GainWaySkinUnLock = 100 // 皮肤解锁消耗
|
||||||
GainWaySkinUpGrade = 101 // 皮肤升级消耗
|
GainWaySkinUpGrade = 101 // 皮肤升级消耗
|
||||||
GainWayItemFen = 102 // 道具分解消耗
|
GainWayItemFen = 102 // 道具分解消耗
|
||||||
GainWayItemFenGain = 103 // 道具分解获得
|
GainWayItemFenGain = 103 // 道具分解获得
|
||||||
GainWayGuide = 104 //新手引导奖励
|
GainWayGuide = 104 //新手引导奖励
|
||||||
GainWayVipGift9 = 105 //vip等级礼包
|
GainWayVipGift9 = 105 //vip等级礼包
|
||||||
GainWayRoomCost = 106 //房费消耗
|
GainWayRoomCost = 106 //房费消耗
|
||||||
GainWayRoomGain = 107 //房卡场获得
|
GainWayRoomGain = 107 //房卡场获得
|
||||||
GainWayItemShop = 108 // 交易市场道具交易
|
GainWayItemShop = 108 // 交易市场道具交易
|
||||||
GainWayClawdollCostItem = 109 // 娃娃机上分扣道具
|
GainWayClawdollCostItem = 109 // 娃娃机上分扣道具
|
||||||
GainWayItemShopChangeDoll = 110 // 商城兑换娃娃
|
GainWayItemShopChangeDoll = 110 // 商城兑换娃娃
|
||||||
GainWayItemBagChangeDoll = 111 // 背包内兑换娃娃
|
GainWayItemBagChangeDoll = 111 // 背包内兑换娃娃
|
||||||
GainWayClawdollCatch = 112 // 娃娃机抓取到娃娃获取卡
|
GainWayClawdollCatch = 112 // 娃娃机抓取到娃娃获取卡
|
||||||
GainWayItemBagChangeDollRevocation = 113 //娃娃兑换后台撤销
|
GainWayItemBagChangeDollRevocation = 113 //娃娃兑换后台撤销
|
||||||
GainWayPermitReset = 114 //赛季通行证积分重置
|
GainWayPermitReset = 114 //赛季通行证积分重置
|
||||||
GainWayClientUpgrade = 115 //客户端升级奖励
|
GainWayClientUpgrade = 115 //客户端升级奖励
|
||||||
GainWayLottery = 116 //开奖码抽奖
|
GainWayLottery = 116 //开奖码抽奖
|
||||||
GainWayGuide2 = 117 // 竞技馆引导奖励
|
GainWayGuide2 = 117 // 竞技馆引导奖励
|
||||||
GainWayCompound = 118 // 道具合成消耗
|
GainWayCompound = 118 // 道具合成消耗
|
||||||
GainWayCompoundGain = 119 // 道具合成获得
|
GainWayCompoundGain = 119 // 道具合成获得
|
||||||
GainWayItem_PigBankTakeCoin = 120 // 购买金币存钱罐奖励道具
|
GainWayItem_PigBankTakeCoin = 120 // 购买金币存钱罐奖励道具
|
||||||
GainWayItem_PigBankTakeDiamond = 121 // 购买钻石存钱罐奖励道具
|
GainWayItem_PigBankTakeDiamond = 121 // 购买钻石存钱罐奖励道具
|
||||||
GainWayNianCost = 122 //年兽活动消耗
|
GainWayNianCost = 122 //年兽活动消耗
|
||||||
GainWayNianGain = 123 //年兽活动获得
|
GainWayNianGain_Attack_LittleGuarantee = 123 //年兽活动小爆竹攻击年兽获得保底奖励
|
||||||
GainWayRedPacket = 124 // 红包奖励
|
GainWayRedPacket = 124 // 红包奖励
|
||||||
|
GainWayNianGain_Sign = 125 //年兽活动签到获得
|
||||||
|
GainWayNianGain_Change = 126 //年兽活动兑换获得
|
||||||
|
GainWayNianGain_BossDie = 127 //年兽活动Boss死亡获得
|
||||||
|
GainWayNianGain_BossDieOther = 128 //年兽活动Boss死亡额外获得
|
||||||
|
GainWayNianGain_Attack_BigOther = 129 //年兽活动大爆竹攻击年兽获得额外奖励
|
||||||
|
GainWayNianGain_Attack_BigGuarantee = 130 //年兽活动大爆竹攻击年兽获得保底奖励
|
||||||
|
GainWayNianGain_Attack_Coin = 131 //攻击年兽获得金币奖励
|
||||||
)
|
)
|
||||||
|
|
||||||
// 后台选择 金币变化类型 的充值 类型id号起始
|
// 后台选择 金币变化类型 的充值 类型id号起始
|
||||||
|
|
|
||||||
|
|
@ -1,84 +0,0 @@
|
||||||
|
|
||||||
"¡<> "¢<>d"¹ê
|
|
||||||
"¡<> "¢<>d"¸ê
|
|
||||||
"¡<> "¢<>d"¸ê
|
|
||||||
"¡<> "¢<>d
|
|
||||||
"¡<> "¢<>c
|
|
||||||
"¢<>b"¡<>
|
|
||||||
"¡<> "¢<>a
|
|
||||||
"¡<> "¢<>`
|
|
||||||
"¡<> "¢<>_
|
|
||||||
|
|
||||||
|
|
||||||
"¡<> "¢<>^
|
|
||||||
"¡<> "¢<>]
|
|
||||||
"¡<> "¢<>\
|
|
||||||
"¡<> "¢<>[
|
|
||||||
"¡<> "¢<>Z
|
|
||||||
"¢<>Y"¡<>
|
|
||||||
"¡<> "¢<>X
|
|
||||||
"¡<> "¢<>W
|
|
||||||
"¡<> "¢<>V
|
|
||||||
"¢<>U"¡<>
|
|
||||||
"¡<> "¢<>T
|
|
||||||
"¡<> "¢<>S
|
|
||||||
"¢<>R"¡<>
|
|
||||||
"¡<> "¢<>Q
|
|
||||||
"¡<> "¢<>P
|
|
||||||
"¡<> "¢<>O
|
|
||||||
"¡<> "¢<>N
|
|
||||||
"¡<> "¢<>M
|
|
||||||
"¡<> "¢<>L
|
|
||||||
"¡<> "¢<>K
|
|
||||||
"¡<> "¢<>J
|
|
||||||
"¡<> "¢<>I
|
|
||||||
"¡<> "¢<>H
|
|
||||||
!!"¡<> "¢<>G
|
|
||||||
"""¢<>F"¡<>
|
|
||||||
##"¡<> "¢<>E
|
|
||||||
$$"¡<> "¢<>D
|
|
||||||
%%"¢<>C"¡<>
|
|
||||||
&&"¡<> "¢<>B
|
|
||||||
''"¡<> "¢<>A
|
|
||||||
(("¡<> "¢<>@
|
|
||||||
)"¢<>d"¹ê"¡<>
|
|
||||||
*"¡<> "¢<>d"¸ê
|
|
||||||
+"¢<>d"¸ê"¡<>
|
|
||||||
,"¡<> "¢<>d
|
|
||||||
-"¡<> "¢<>c
|
|
||||||
."¡<> "¢<>b
|
|
||||||
/"¡<> "¢<>a
|
|
||||||
0"¢<>`"¡<>
|
|
||||||
1 "¡<> "¢<>_
|
|
||||||
2
|
|
||||||
"¡<> "¢<>^
|
|
||||||
3 "¡<> "¢<>]
|
|
||||||
4 "¡<> "¢<>\
|
|
||||||
5
"¡<> "¢<>[
|
|
||||||
6"¡<> "¢<>Z
|
|
||||||
7"¡<> "¢<>Y
|
|
||||||
8"¡<> "¢<>X
|
|
||||||
9"¡<> "¢<>W
|
|
||||||
:"¡<> "¢<>V
|
|
||||||
;"¡<> "¢<>U
|
|
||||||
<"¡<> "¢<>T
|
|
||||||
="¢<>S"¡<>
|
|
||||||
>"¡<> "¢<>R
|
|
||||||
?"¡<> "¢<>Q
|
|
||||||
@"¡<> "¢<>P
|
|
||||||
A"¡<> "¢<>O
|
|
||||||
B"¡<> "¢<>N
|
|
||||||
C"¢<>M"¡<>
|
|
||||||
D "¡<> "¢<>L
|
|
||||||
E "¡<> "¢<>K
|
|
||||||
F "¡<> "¢<>J
|
|
||||||
G "¡<> "¢<>I
|
|
||||||
H "¡<> "¢<>H
|
|
||||||
I!"¡<> "¢<>G
|
|
||||||
J""¡<> "¢<>F
|
|
||||||
K#"¡<> "¢<>E
|
|
||||||
L$"¡<> "¢<>D
|
|
||||||
M%"¡<> "¢<>C
|
|
||||||
N&"¡<> "¢<>B
|
|
||||||
O'"¢<>A"¡<>
|
|
||||||
P("¡<> "¢<>@
|
|
||||||
|
|
@ -1,730 +0,0 @@
|
||||||
{
|
|
||||||
"Arr": [
|
|
||||||
{
|
|
||||||
"Id": 1,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 1,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30009": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 2,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 2,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30008": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 3,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 3,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30008": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 4,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 4,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 5,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 5,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 99
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 6,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 6,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 98
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 7,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 7,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 97
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 8,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 8,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 96
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 9,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 9,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 95
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 10,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 10,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 94
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 11,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 11,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 93
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 12,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 12,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 92
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 13,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 13,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 91
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 14,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 14,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 90
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 15,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 15,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 89
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 16,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 16,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 88
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 17,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 17,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 87
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 18,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 18,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 86
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 19,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 19,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 85
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 20,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 20,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 84
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 21,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 21,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 83
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 22,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 22,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 82
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 23,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 23,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 81
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 24,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 24,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 80
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 25,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 25,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 79
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 26,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 26,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 78
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 27,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 27,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 77
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 28,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 28,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 76
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 29,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 29,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 75
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 30,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 30,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 74
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 31,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 31,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 73
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 32,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 32,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 72
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 33,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 33,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 71
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 34,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 34,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 70
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 35,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 35,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 69
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 36,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 36,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 68
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 37,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 37,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 67
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 38,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 38,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 66
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 39,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 39,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 65
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 40,
|
|
||||||
"RankType": 1,
|
|
||||||
"RankLevelId": 40,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 64
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 41,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 1,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30009": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 42,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 2,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30008": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 43,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 3,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100,
|
|
||||||
"30008": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 44,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 4,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 100
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 45,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 5,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 99
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 46,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 6,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 98
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 47,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 7,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 97
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 48,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 8,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 96
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 49,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 9,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 95
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 50,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 10,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 94
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 51,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 11,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 93
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 52,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 12,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 92
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 53,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 13,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 91
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 54,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 14,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 90
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 55,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 15,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 89
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 56,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 16,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 88
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 57,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 17,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 87
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 58,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 18,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 86
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 59,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 19,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 85
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 60,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 20,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 84
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 61,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 21,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 83
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 62,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 22,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 82
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 63,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 23,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 81
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 64,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 24,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 80
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 65,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 25,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 79
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 66,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 26,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 78
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 67,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 27,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 77
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 68,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 28,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 76
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 69,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 29,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 75
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 70,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 30,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 74
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 71,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 31,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 73
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 72,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 32,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 72
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 73,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 33,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 71
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 74,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 34,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 70
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 75,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 35,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 69
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 76,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 36,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 68
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 77,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 37,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 67
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 78,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 38,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 66
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 79,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 39,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 65
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 80,
|
|
||||||
"RankType": 2,
|
|
||||||
"RankLevelId": 40,
|
|
||||||
"AwardMap": {
|
|
||||||
"100001": 30,
|
|
||||||
"100002": 64
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
BIN
data/DB_Task.dat
BIN
data/DB_Task.dat
Binary file not shown.
|
|
@ -205,6 +205,9 @@ type SCNianData struct {
|
||||||
BuffEndTime int64 `protobuf:"varint,11,opt,name=BuffEndTime,proto3" json:"BuffEndTime,omitempty"` //Buff结束领取时间
|
BuffEndTime int64 `protobuf:"varint,11,opt,name=BuffEndTime,proto3" json:"BuffEndTime,omitempty"` //Buff结束领取时间
|
||||||
ShopData []*ShopData `protobuf:"bytes,12,rep,name=shopData,proto3" json:"shopData,omitempty"` //购买礼包数量
|
ShopData []*ShopData `protobuf:"bytes,12,rep,name=shopData,proto3" json:"shopData,omitempty"` //购买礼包数量
|
||||||
ChangeData string `protobuf:"bytes,13,opt,name=ChangeData,proto3" json:"ChangeData,omitempty"` //兑换数据
|
ChangeData string `protobuf:"bytes,13,opt,name=ChangeData,proto3" json:"ChangeData,omitempty"` //兑换数据
|
||||||
|
LuckyRankNeed string `protobuf:"bytes,14,opt,name=LuckyRankNeed,proto3" json:"LuckyRankNeed,omitempty"` //幸运榜上榜条件
|
||||||
|
RankNeed string `protobuf:"bytes,15,opt,name=RankNeed,proto3" json:"RankNeed,omitempty"` //总伤害榜上榜条件
|
||||||
|
Switch int32 `protobuf:"varint,16,opt,name=Switch,proto3" json:"Switch,omitempty"` //活动开关 1.开启 2.关闭
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *SCNianData) Reset() {
|
func (x *SCNianData) Reset() {
|
||||||
|
|
@ -330,6 +333,27 @@ func (x *SCNianData) GetChangeData() string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *SCNianData) GetLuckyRankNeed() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.LuckyRankNeed
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SCNianData) GetRankNeed() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.RankNeed
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SCNianData) GetSwitch() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Switch
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
type ShopData struct {
|
type ShopData struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
|
|
@ -1039,7 +1063,7 @@ var file_protocol_activity_nian_proto_rawDesc = []byte{
|
||||||
0x0a, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
|
0x0a, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
|
||||||
0x69, 0x74, 0x79, 0x2f, 0x6e, 0x69, 0x61, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08,
|
0x69, 0x74, 0x79, 0x2f, 0x6e, 0x69, 0x61, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08,
|
||||||
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e, 0x69,
|
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e, 0x69,
|
||||||
0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0xe8, 0x03, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
|
0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0xc2, 0x04, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
|
||||||
0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
||||||
0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
|
0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
|
||||||
0x52, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54,
|
0x52, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54,
|
||||||
|
|
@ -1070,112 +1094,118 @@ var file_protocol_activity_nian_proto_rawDesc = []byte{
|
||||||
0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
|
0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x73, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74,
|
||||||
0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18,
|
0x61, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x18,
|
||||||
0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x61, 0x74,
|
0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x61, 0x74,
|
||||||
0x61, 0x22, 0x5c, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a,
|
0x61, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x75, 0x63, 0x6b, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x4e, 0x65,
|
||||||
0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53,
|
0x65, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x4c, 0x75, 0x63, 0x6b, 0x79, 0x52,
|
||||||
0x68, 0x6f, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d,
|
0x61, 0x6e, 0x6b, 0x4e, 0x65, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x4e,
|
||||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x12,
|
0x65, 0x65, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x4e,
|
||||||
0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x78, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20,
|
0x65, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x10, 0x20,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d, 0x61, 0x78, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x22,
|
0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x5c, 0x0a, 0x08, 0x53,
|
||||||
0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x22, 0x65, 0x0a,
|
0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49,
|
||||||
0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x42,
|
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x12,
|
||||||
0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
|
0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||||
0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52,
|
0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x61, 0x78,
|
||||||
0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61,
|
0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4d,
|
||||||
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
|
0x61, 0x78, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x75, 0x6d, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e,
|
||||||
0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74,
|
0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x22, 0x65, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
|
||||||
0x43, 0x6f, 0x64, 0x65, 0x22, 0x52, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b,
|
0x6e, 0x42, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75,
|
||||||
0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01,
|
0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f,
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x04,
|
0x75, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65,
|
||||||
0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
||||||
0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e,
|
0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e,
|
||||||
0x66, 0x6f, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x55, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e,
|
0x69, 0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x52,
|
||||||
0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x61, 0x6e, 0x6b,
|
0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16,
|
||||||
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64,
|
0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
|
||||||
0x12, 0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02,
|
||||||
0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41,
|
0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e,
|
||||||
0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22,
|
0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x44, 0x61,
|
||||||
0x41, 0x0a, 0x0d, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61,
|
0x74, 0x61, 0x22, 0x55, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e,
|
||||||
0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d,
|
0x28, 0x05, 0x52, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x2d, 0x0a, 0x05, 0x41, 0x77,
|
||||||
0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e,
|
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69,
|
||||||
0x75, 0x6d, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61,
|
0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61,
|
||||||
0x63, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x41, 0x0a, 0x0d, 0x52, 0x61, 0x6e,
|
||||||
0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0xe8, 0x02, 0x0a, 0x10, 0x53,
|
0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74,
|
||||||
0x43, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12,
|
0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d,
|
||||||
0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20,
|
||||||
0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48,
|
0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x26, 0x0a, 0x0c,
|
||||||
0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x12,
|
0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x12, 0x16, 0x0a, 0x06,
|
||||||
0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
|
0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79,
|
||||||
0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77,
|
0x70, 0x65, 0x49, 0x64, 0x22, 0xe8, 0x02, 0x0a, 0x10, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x41,
|
||||||
0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a,
|
0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70,
|
||||||
0x0a, 0x08, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
|
0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49,
|
||||||
0x52, 0x08, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73,
|
0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x44, 0x69, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x44, 0x69, 0x65,
|
0x03, 0x52, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x12, 0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61,
|
||||||
0x12, 0x33, 0x0a, 0x08, 0x44, 0x69, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03,
|
0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76,
|
||||||
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61,
|
|
||||||
0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x44, 0x69, 0x65,
|
|
||||||
0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75,
|
|
||||||
0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f,
|
|
||||||
0x75, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x09, 0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70,
|
|
||||||
0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
|
||||||
0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52,
|
|
||||||
0x09, 0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x12, 0x39, 0x0a, 0x0b, 0x46, 0x6c,
|
|
||||||
0x6f, 0x6f, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
|
||||||
0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41,
|
|
||||||
0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52,
|
|
||||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53,
|
|
||||||
0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0xa9, 0x01, 0x0a, 0x0f, 0x53, 0x43, 0x4e,
|
|
||||||
0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d,
|
|
||||||
0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20,
|
|
||||||
0x01, 0x28, 0x03, 0x52, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69,
|
|
||||||
0x6d, 0x65, 0x12, 0x35, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18,
|
|
||||||
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
|
||||||
0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09,
|
|
||||||
0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52,
|
|
||||||
0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61,
|
|
||||||
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
|
|
||||||
0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74,
|
|
||||||
0x43, 0x6f, 0x64, 0x65, 0x22, 0x20, 0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68,
|
|
||||||
0x61, 0x6e, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
|
|
||||||
0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x53, 0x43, 0x4e, 0x69, 0x61,
|
|
||||||
0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01,
|
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61,
|
|
||||||
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76,
|
|
||||||
0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74,
|
0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74,
|
||||||
0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65,
|
0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x74, 0x74, 0x61,
|
||||||
0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61, 0x63,
|
0x63, 0x6b, 0x48, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x41, 0x74, 0x74, 0x61,
|
||||||
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43,
|
0x63, 0x6b, 0x48, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x44, 0x69, 0x65, 0x18, 0x05, 0x20,
|
||||||
0x6f, 0x64, 0x65, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43,
|
0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x44, 0x69, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x44, 0x69,
|
||||||
0x6f, 0x64, 0x65, 0x2a, 0xe2, 0x02, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x50, 0x61, 0x63, 0x6b,
|
0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61,
|
||||||
0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4e,
|
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72,
|
||||||
0x69, 0x61, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41,
|
0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x44, 0x69, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12,
|
||||||
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10,
|
0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01,
|
||||||
0xe4, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e,
|
0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x35, 0x0a,
|
||||||
0x69, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe5, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41,
|
0x09, 0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b,
|
||||||
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10,
|
0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b,
|
||||||
0xe6, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e,
|
0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x78, 0x74, 0x72, 0x61,
|
||||||
0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10, 0xe7, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41,
|
0x44, 0x72, 0x6f, 0x70, 0x12, 0x39, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x77,
|
||||||
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44,
|
0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69,
|
||||||
0x61, 0x74, 0x61, 0x10, 0xe8, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
|
0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61,
|
||||||
0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10,
|
0x74, 0x61, 0x52, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22,
|
||||||
0xe9, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e,
|
0x11, 0x0a, 0x0f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61,
|
||||||
0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x10, 0xea, 0x14, 0x12, 0x1c, 0x0a, 0x17,
|
0x72, 0x64, 0x22, 0xa9, 0x01, 0x0a, 0x0f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67,
|
||||||
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74,
|
0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77,
|
||||||
0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xeb, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41,
|
0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x53,
|
||||||
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41,
|
0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x09,
|
||||||
0x77, 0x61, 0x72, 0x64, 0x10, 0xec, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45,
|
0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||||
0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72,
|
0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41,
|
||||||
0x64, 0x10, 0xed, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
|
0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77,
|
||||||
0x53, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xee, 0x14, 0x12, 0x18,
|
0x61, 0x72, 0x64, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65,
|
||||||
0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x43,
|
0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
||||||
0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xef, 0x14, 0x2a, 0x3e, 0x0a, 0x11, 0x4f, 0x70, 0x52, 0x65,
|
0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e,
|
||||||
0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x12, 0x14, 0x0a,
|
0x69, 0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x20,
|
||||||
0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x4e, 0x69, 0x61,
|
0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x10,
|
||||||
0x6e, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f,
|
0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d,
|
||||||
0x72, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x10, 0x01, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67,
|
0x22, 0x8a, 0x01, 0x0a, 0x0c, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67,
|
||||||
0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
|
0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
|
||||||
0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
|
0x4e, 0x75, 0x6d, 0x12, 0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03,
|
||||||
0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61,
|
||||||
|
0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61,
|
||||||
|
0x72, 0x64, 0x12, 0x39, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18,
|
||||||
|
0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
||||||
|
0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x4e, 0x69,
|
||||||
|
0x61, 0x6e, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x2a, 0xe2, 0x02,
|
||||||
|
0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14,
|
||||||
|
0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x5f, 0x5a, 0x45,
|
||||||
|
0x52, 0x4f, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
|
||||||
|
0x53, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe4, 0x14, 0x12, 0x16, 0x0a, 0x11,
|
||||||
|
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61, 0x74,
|
||||||
|
0x61, 0x10, 0xe5, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
|
||||||
|
0x53, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10, 0xe6, 0x14, 0x12, 0x16, 0x0a, 0x11,
|
||||||
|
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66,
|
||||||
|
0x66, 0x10, 0xe7, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
|
||||||
|
0x53, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe8, 0x14,
|
||||||
|
0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61,
|
||||||
|
0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe9, 0x14, 0x12, 0x18, 0x0a, 0x13,
|
||||||
|
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74,
|
||||||
|
0x61, 0x63, 0x6b, 0x10, 0xea, 0x14, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
|
||||||
|
0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74,
|
||||||
|
0x61, 0x10, 0xeb, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
|
||||||
|
0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xec,
|
||||||
|
0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69,
|
||||||
|
0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xed, 0x14, 0x12, 0x18,
|
||||||
|
0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x43,
|
||||||
|
0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xee, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
|
||||||
|
0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10,
|
||||||
|
0xef, 0x14, 0x2a, 0x3e, 0x0a, 0x11, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f,
|
||||||
|
0x64, 0x65, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f,
|
||||||
|
0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x10, 0x00, 0x12, 0x13, 0x0a,
|
||||||
|
0x0f, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x4e, 0x69, 0x61, 0x6e,
|
||||||
|
0x10, 0x01, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65,
|
||||||
|
0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||||
|
0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72,
|
||||||
|
0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,9 @@ message SCNianData{
|
||||||
int64 BuffEndTime = 11; //Buff结束领取时间
|
int64 BuffEndTime = 11; //Buff结束领取时间
|
||||||
repeated ShopData shopData = 12;//购买礼包数量
|
repeated ShopData shopData = 12;//购买礼包数量
|
||||||
string ChangeData = 13; //兑换数据
|
string ChangeData = 13; //兑换数据
|
||||||
|
string LuckyRankNeed = 14; //幸运榜上榜条件
|
||||||
|
string RankNeed = 15; //总伤害榜上榜条件
|
||||||
|
int32 Switch = 16; //活动开关 1.开启 2.关闭
|
||||||
}
|
}
|
||||||
|
|
||||||
message ShopData{
|
message ShopData{
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1279,22 +1279,6 @@ message DB_NewYearActivityArray {
|
||||||
repeated DB_NewYearActivity Arr = 1;
|
repeated DB_NewYearActivity Arr = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
message DB_NewYearRankReward {
|
|
||||||
|
|
||||||
int32 Id = 1;
|
|
||||||
|
|
||||||
int32 RankType = 2;
|
|
||||||
|
|
||||||
int32 RankLevelId = 3;
|
|
||||||
|
|
||||||
map<int64, int64> AwardMap = 4;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
message DB_NewYearRankRewardArray {
|
|
||||||
repeated DB_NewYearRankReward Arr = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message DB_PassShow {
|
message DB_PassShow {
|
||||||
|
|
||||||
int32 Id = 1;
|
int32 Id = 1;
|
||||||
|
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
|
|
||||||
// Code generated by xlsx2proto.
|
|
||||||
// DO NOT EDIT!
|
|
||||||
|
|
||||||
package srvdata
|
|
||||||
|
|
||||||
import (
|
|
||||||
"google.golang.org/protobuf/proto"
|
|
||||||
|
|
||||||
"mongo.games.com/game/protocol/server"
|
|
||||||
)
|
|
||||||
|
|
||||||
var PBDB_NewYearRankRewardMgr = &DB_NewYearRankRewardMgr{
|
|
||||||
Datas: &server.DB_NewYearRankRewardArray{},
|
|
||||||
pool: make(map[int32]*server.DB_NewYearRankReward),
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
type DB_NewYearRankRewardMgr struct {
|
|
||||||
Datas *server.DB_NewYearRankRewardArray
|
|
||||||
pool map[int32]*server.DB_NewYearRankReward
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *DB_NewYearRankRewardMgr) unmarshal(data []byte) error {
|
|
||||||
err := proto.Unmarshal(data, this.Datas)
|
|
||||||
if err == nil {
|
|
||||||
this.arrangeData()
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *DB_NewYearRankRewardMgr) reunmarshal(data []byte) error {
|
|
||||||
newDatas := &server.DB_NewYearRankRewardArray{}
|
|
||||||
err := proto.Unmarshal(data, newDatas)
|
|
||||||
if err == nil {
|
|
||||||
for _, item := range newDatas.Arr {
|
|
||||||
existItem := this.GetData(item.GetId())
|
|
||||||
if existItem == nil {
|
|
||||||
this.pool[item.GetId()] = item
|
|
||||||
this.Datas.Arr = append(this.Datas.Arr, item)
|
|
||||||
|
|
||||||
} else {
|
|
||||||
*existItem = *item
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *DB_NewYearRankRewardMgr) arrangeData() {
|
|
||||||
if this.Datas == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
dataArr := this.Datas.GetArr()
|
|
||||||
if dataArr == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, data := range dataArr {
|
|
||||||
this.pool[data.GetId()] = data
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *DB_NewYearRankRewardMgr) GetData(id int32) *server.DB_NewYearRankReward {
|
|
||||||
if data, ok := this.pool[id]; ok {
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
DataMgr.register("DB_NewYearRankReward.dat", &ProtobufDataLoader{dh: PBDB_NewYearRankRewardMgr})
|
|
||||||
}
|
|
||||||
|
|
@ -128,6 +128,18 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er
|
||||||
nextDay := time.Now().Add(24 * time.Hour).Truncate(24 * time.Hour)
|
nextDay := time.Now().Add(24 * time.Hour).Truncate(24 * time.Hour)
|
||||||
signTime = nextDay.Unix()
|
signTime = nextDay.Unix()
|
||||||
}
|
}
|
||||||
|
for _, value := range sData {
|
||||||
|
if value.Id == 7 {
|
||||||
|
pack.LuckyRankNeed = value.PropValue
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, value := range sData {
|
||||||
|
if value.Id == 8 {
|
||||||
|
pack.RankNeed = value.PropValue
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
StartTs := common.IntToTime(int(pool.List[0].BuffStartTime)).Unix()
|
StartTs := common.IntToTime(int(pool.List[0].BuffStartTime)).Unix()
|
||||||
EndTs := common.IntToTime(int(pool.List[0].BuffEndTime)).Unix()
|
EndTs := common.IntToTime(int(pool.List[0].BuffEndTime)).Unix()
|
||||||
pack.BuffStartTime = StartTs
|
pack.BuffStartTime = StartTs
|
||||||
|
|
@ -141,6 +153,7 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er
|
||||||
pack.BuffStatus = p.WelfData.NianData.BuffStatus
|
pack.BuffStatus = p.WelfData.NianData.BuffStatus
|
||||||
pack.SignAwardTime = signTime
|
pack.SignAwardTime = signTime
|
||||||
pack.ChangeData = changeData
|
pack.ChangeData = changeData
|
||||||
|
pack.Switch = pool.Switch
|
||||||
logger.Logger.Trace("请求年兽活动信息 ", pack)
|
logger.Logger.Trace("请求年兽活动信息 ", pack)
|
||||||
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianData), pack)
|
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianData), pack)
|
||||||
}
|
}
|
||||||
|
|
@ -207,15 +220,15 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
} else {
|
} else {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
var items []*model.Item
|
var costItems []*model.Item
|
||||||
items = append(items, &model.Item{
|
costItems = append(costItems, &model.Item{
|
||||||
ItemId: int32(itemId),
|
ItemId: int32(itemId),
|
||||||
ItemNum: int64(-itemNum),
|
ItemNum: int64(-itemNum),
|
||||||
})
|
})
|
||||||
_, _, result := BagMgrSingleton.AddItems(&model.AddItemParam{
|
_, _, result := BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
Platform: p.Platform,
|
Platform: p.Platform,
|
||||||
SnId: p.SnId,
|
SnId: p.SnId,
|
||||||
Change: items,
|
Change: costItems,
|
||||||
GainWay: common.GainWayNianCost,
|
GainWay: common.GainWayNianCost,
|
||||||
Operator: "system",
|
Operator: "system",
|
||||||
Remark: "年兽活动消耗",
|
Remark: "年兽活动消耗",
|
||||||
|
|
@ -223,7 +236,6 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
if !result {
|
if !result {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
items = []*model.Item{}
|
|
||||||
//本次攻击总血量
|
//本次攻击总血量
|
||||||
AttackHp := int64(0)
|
AttackHp := int64(0)
|
||||||
LuckyRankNeed := int64(0)
|
LuckyRankNeed := int64(0)
|
||||||
|
|
@ -309,6 +321,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
if typeId == 3 {
|
if typeId == 3 {
|
||||||
p.WelfData.NianData.BigHurt += 1
|
p.WelfData.NianData.BigHurt += 1
|
||||||
//判断是否掉落保底奖励
|
//判断是否掉落保底奖励
|
||||||
|
var guaranteeItems []*model.Item
|
||||||
if p.WelfData.NianData.BigHurt%int32(floorCount) == 0 {
|
if p.WelfData.NianData.BigHurt%int32(floorCount) == 0 {
|
||||||
floorReward := &activity.RankAwardData{}
|
floorReward := &activity.RankAwardData{}
|
||||||
for _, value := range sData {
|
for _, value := range sData {
|
||||||
|
|
@ -316,7 +329,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
strSlice := strings.Split(value.PropValue, ",")
|
strSlice := strings.Split(value.PropValue, ",")
|
||||||
FloorItemId, _ := strconv.Atoi(strSlice[0])
|
FloorItemId, _ := strconv.Atoi(strSlice[0])
|
||||||
FloorItemNum, _ := strconv.Atoi(strSlice[1])
|
FloorItemNum, _ := strconv.Atoi(strSlice[1])
|
||||||
items = append(items, &model.Item{
|
guaranteeItems = append(guaranteeItems, &model.Item{
|
||||||
ItemId: int32(FloorItemId),
|
ItemId: int32(FloorItemId),
|
||||||
ItemNum: int64(FloorItemNum),
|
ItemNum: int64(FloorItemNum),
|
||||||
})
|
})
|
||||||
|
|
@ -327,6 +340,14 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
|
Platform: p.Platform,
|
||||||
|
SnId: p.SnId,
|
||||||
|
Change: guaranteeItems,
|
||||||
|
GainWay: common.GainWayNianGain_Attack_BigGuarantee,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "年兽活动-大爆竹保底奖励",
|
||||||
|
})
|
||||||
//额外掉落
|
//额外掉落
|
||||||
extraItemId := 0
|
extraItemId := 0
|
||||||
extraItemNum := 0
|
extraItemNum := 0
|
||||||
|
|
@ -354,10 +375,19 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
}
|
}
|
||||||
//随机个数
|
//随机个数
|
||||||
extraItemNum = rand.Intn(intSlice1[1]-intSlice1[0]+1) + intSlice1[0]
|
extraItemNum = rand.Intn(intSlice1[1]-intSlice1[0]+1) + intSlice1[0]
|
||||||
items = append(items, &model.Item{
|
var extraItems []*model.Item
|
||||||
|
extraItems = append(extraItems, &model.Item{
|
||||||
ItemId: int32(extraItemId),
|
ItemId: int32(extraItemId),
|
||||||
ItemNum: int64(extraItemNum),
|
ItemNum: int64(extraItemNum),
|
||||||
})
|
})
|
||||||
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
|
Platform: p.Platform,
|
||||||
|
SnId: p.SnId,
|
||||||
|
Change: extraItems,
|
||||||
|
GainWay: common.GainWayNianGain_Attack_BigOther,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "年兽活动-打爆竹额外活动奖励",
|
||||||
|
})
|
||||||
extraDrop := &activity.RankAwardData{}
|
extraDrop := &activity.RankAwardData{}
|
||||||
extraDrop.ItemId = int32(extraItemId)
|
extraDrop.ItemId = int32(extraItemId)
|
||||||
extraDrop.ItemNum = int64(extraItemNum)
|
extraDrop.ItemNum = int64(extraItemNum)
|
||||||
|
|
@ -365,6 +395,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
} else {
|
} else {
|
||||||
p.WelfData.NianData.LittleHurt += 1
|
p.WelfData.NianData.LittleHurt += 1
|
||||||
//判断是否掉落保底奖励
|
//判断是否掉落保底奖励
|
||||||
|
var guaranteeItems []*model.Item
|
||||||
if p.WelfData.NianData.LittleHurt%int32(floorCount) == 0 {
|
if p.WelfData.NianData.LittleHurt%int32(floorCount) == 0 {
|
||||||
floorReward := &activity.RankAwardData{}
|
floorReward := &activity.RankAwardData{}
|
||||||
for _, value := range sData {
|
for _, value := range sData {
|
||||||
|
|
@ -372,7 +403,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
strSlice := strings.Split(value.PropValue, ",")
|
strSlice := strings.Split(value.PropValue, ",")
|
||||||
FloorItemId, _ := strconv.Atoi(strSlice[0])
|
FloorItemId, _ := strconv.Atoi(strSlice[0])
|
||||||
FloorItemNum, _ := strconv.Atoi(strSlice[1])
|
FloorItemNum, _ := strconv.Atoi(strSlice[1])
|
||||||
items = append(items, &model.Item{
|
guaranteeItems = append(guaranteeItems, &model.Item{
|
||||||
ItemId: int32(FloorItemId),
|
ItemId: int32(FloorItemId),
|
||||||
ItemNum: int64(FloorItemNum),
|
ItemNum: int64(FloorItemNum),
|
||||||
})
|
})
|
||||||
|
|
@ -383,6 +414,14 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
|
Platform: p.Platform,
|
||||||
|
SnId: p.SnId,
|
||||||
|
Change: guaranteeItems,
|
||||||
|
GainWay: common.GainWayNianGain_Attack_LittleGuarantee,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "年兽活动-小爆竹额外掉落奖励",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
p.WelfData.NianData.BossHp -= AttackHp
|
p.WelfData.NianData.BossHp -= AttackHp
|
||||||
|
|
@ -395,32 +434,27 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
p.WelfData.NianData.BossHp = BossMaxHp
|
p.WelfData.NianData.BossHp = BossMaxHp
|
||||||
p.WelfData.NianData.BossDieCount += 1
|
p.WelfData.NianData.BossDieCount += 1
|
||||||
//获取死亡奖励
|
//获取死亡奖励
|
||||||
for _, value := range sData {
|
var bossDieItems []*model.Item
|
||||||
if value.Id == 6 {
|
for _, value := range pool.List[0].BossDieReward {
|
||||||
str := value.PropValue
|
bossDieItemId := value.ItemId
|
||||||
strSlice := strings.Split(str, ";")
|
bossDieItemNum := value.ItemNum
|
||||||
for _, s := range strSlice {
|
bossDieAward = append(bossDieAward, &model.Item{
|
||||||
strSlice1 := strings.Split(s, ",")
|
ItemId: bossDieItemId,
|
||||||
bossDieItemId, err := strconv.Atoi(strSlice1[0])
|
ItemNum: bossDieItemNum,
|
||||||
if err != nil {
|
})
|
||||||
return nil
|
bossDieItems = append(bossDieItems, &model.Item{
|
||||||
}
|
ItemId: bossDieItemId,
|
||||||
bossDieItemNum, err := strconv.ParseInt(strSlice1[1], 10, 64)
|
ItemNum: bossDieItemNum,
|
||||||
if err != nil {
|
})
|
||||||
return nil
|
|
||||||
}
|
|
||||||
bossDieAward = append(bossDieAward, &model.Item{
|
|
||||||
ItemId: int32(bossDieItemId),
|
|
||||||
ItemNum: bossDieItemNum,
|
|
||||||
})
|
|
||||||
items = append(items, &model.Item{
|
|
||||||
ItemId: int32(bossDieItemId),
|
|
||||||
ItemNum: bossDieItemNum,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
|
Platform: p.Platform,
|
||||||
|
SnId: p.SnId,
|
||||||
|
Change: bossDieItems,
|
||||||
|
GainWay: common.GainWayNianGain_BossDie,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "年兽活动-Boss死亡获得",
|
||||||
|
})
|
||||||
//年兽死亡额外掉落
|
//年兽死亡额外掉落
|
||||||
BigHurtCount := 0
|
BigHurtCount := 0
|
||||||
for _, value := range sData {
|
for _, value := range sData {
|
||||||
|
|
@ -432,21 +466,21 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
logger.Logger.Trace("年兽死亡额外掉落 当前已使用BigHurt ：", p.WelfData.NianData.BigHurt, "BigHurtCount = ", BigHurtCount)
|
logger.Logger.Trace("年兽死亡额外掉落 当前已使用BigHurt ：", p.WelfData.NianData.BigHurt, "BigHurtCount = ", BigHurtCount)
|
||||||
if p.WelfData.NianData.BigHurt >= int32(BigHurtCount) {
|
if p.WelfData.NianData.BigHurt >= int32(BigHurtCount) {
|
||||||
//后台配置额外掉落
|
//后台配置额外掉落
|
||||||
|
var bossDieOther []*model.Item
|
||||||
for _, info := range pool.List[0].BossDieOtherReward {
|
for _, info := range pool.List[0].BossDieOtherReward {
|
||||||
//value.BossDieOtherReward
|
|
||||||
if p.WelfData.NianData.OtherAwardNum[info.Id] >= info.DropUp {
|
if p.WelfData.NianData.OtherAwardNum[info.Id] >= info.DropUp {
|
||||||
logger.Logger.Trace("BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量：", p.WelfData.NianData.OtherAwardNum[info.Id])
|
logger.Logger.Trace("BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量：", p.WelfData.NianData.OtherAwardNum[info.Id])
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
//随机
|
//随机
|
||||||
if rand.Intn(100) < int(info.DropRate) {
|
if rand.Intn(100)+1 <= int(info.DropRate) {
|
||||||
otherItemId := info.ItemId
|
otherItemId := info.ItemId
|
||||||
otherItemNum := info.ItemNum
|
otherItemNum := info.ItemNum
|
||||||
if int32(otherItemNum)+p.WelfData.NianData.OtherAwardNum[info.Id] > info.DropUp {
|
if int32(otherItemNum)+p.WelfData.NianData.OtherAwardNum[info.Id] > info.DropUp {
|
||||||
otherItemNum = int64(info.DropUp - p.WelfData.NianData.OtherAwardNum[info.Id])
|
otherItemNum = int64(info.DropUp - p.WelfData.NianData.OtherAwardNum[info.Id])
|
||||||
}
|
}
|
||||||
p.WelfData.NianData.OtherAwardNum[info.Id] += int32(otherItemNum)
|
p.WelfData.NianData.OtherAwardNum[info.Id] += int32(otherItemNum)
|
||||||
items = append(items, &model.Item{
|
bossDieOther = append(bossDieOther, &model.Item{
|
||||||
ItemId: otherItemId,
|
ItemId: otherItemId,
|
||||||
ItemNum: otherItemNum,
|
ItemNum: otherItemNum,
|
||||||
})
|
})
|
||||||
|
|
@ -454,21 +488,30 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
ItemId: otherItemId,
|
ItemId: otherItemId,
|
||||||
ItemNum: otherItemNum,
|
ItemNum: otherItemNum,
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
|
Platform: p.Platform,
|
||||||
|
SnId: p.SnId,
|
||||||
|
Change: bossDieOther,
|
||||||
|
GainWay: common.GainWayNianGain_BossDieOther,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "年兽活动-攻击年兽额外获得",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
TaskSubjectSingleton.Touch(common.TaskTypeNianBossKill, &TaskData{SnId: p.SnId, Num: 1}) // BOSS死亡
|
TaskSubjectSingleton.Touch(common.TaskTypeNianBossKill, &TaskData{SnId: p.SnId, Num: 1}) // BOSS死亡
|
||||||
}
|
}
|
||||||
|
coinItems := []*model.Item{}
|
||||||
items = append(items, &model.Item{
|
coinItems = append(coinItems, &model.Item{
|
||||||
ItemId: common.ItemIDCoin,
|
ItemId: common.ItemIDCoin,
|
||||||
ItemNum: AttackHp,
|
ItemNum: AttackHp,
|
||||||
})
|
})
|
||||||
BagMgrSingleton.AddItems(&model.AddItemParam{
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
Platform: p.Platform,
|
Platform: p.Platform,
|
||||||
SnId: p.SnId,
|
SnId: p.SnId,
|
||||||
Change: items,
|
Change: coinItems,
|
||||||
GainWay: common.GainWayNianGain,
|
GainWay: common.GainWayNianGain_Attack_Coin,
|
||||||
Operator: "system",
|
Operator: "system",
|
||||||
Remark: "年兽活动-攻击年兽获得",
|
Remark: "年兽活动-攻击年兽获得",
|
||||||
})
|
})
|
||||||
|
|
@ -522,7 +565,6 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) error {
|
func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) error {
|
||||||
if _, ok := data.(*activity.CSNianBuff); ok {
|
if _, ok := data.(*activity.CSNianBuff); ok {
|
||||||
p := PlayerMgrSington.GetOnlinePlayer(sid)
|
p := PlayerMgrSington.GetOnlinePlayer(sid)
|
||||||
//yearActivity := &server.DB_NewYearActivity{}
|
|
||||||
logger.Logger.Trace("客户端请求请求领取BUFF snid = ", p.SnId)
|
logger.Logger.Trace("客户端请求请求领取BUFF snid = ", p.SnId)
|
||||||
if p == nil {
|
if p == nil {
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -563,6 +605,8 @@ func CSNianBuff(s *netlib.Session, packetid int, data interface{}, sid int64) er
|
||||||
BuffCount: p.WelfData.NianData.BuffCount,
|
BuffCount: p.WelfData.NianData.BuffCount,
|
||||||
}
|
}
|
||||||
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianBuff), pack)
|
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianBuff), pack)
|
||||||
|
//统计领取BUff
|
||||||
|
//mq.Write()
|
||||||
} else {
|
} else {
|
||||||
logger.Logger.Trace("CSNianSignAward 活动时间未到！")
|
logger.Logger.Trace("CSNianSignAward 活动时间未到！")
|
||||||
pack := &activity.SCNianBuff{
|
pack := &activity.SCNianBuff{
|
||||||
|
|
@ -614,7 +658,6 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
|
||||||
}
|
}
|
||||||
p.WelfData.NianData.SignAwardTime = time.Now().Unix()
|
p.WelfData.NianData.SignAwardTime = time.Now().Unix()
|
||||||
//奖励
|
//奖励
|
||||||
|
|
||||||
pack.SignAwardTime = p.WelfData.NianData.SignAwardTime
|
pack.SignAwardTime = p.WelfData.NianData.SignAwardTime
|
||||||
var items []*model.Item
|
var items []*model.Item
|
||||||
for _, info := range pool.List[0].SignReward {
|
for _, info := range pool.List[0].SignReward {
|
||||||
|
|
@ -632,7 +675,7 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
|
||||||
Platform: p.Platform,
|
Platform: p.Platform,
|
||||||
SnId: p.SnId,
|
SnId: p.SnId,
|
||||||
Change: items,
|
Change: items,
|
||||||
GainWay: common.GainWayNianGain,
|
GainWay: common.GainWayNianGain_Sign,
|
||||||
Operator: "system",
|
Operator: "system",
|
||||||
Remark: "年兽活动-领取签到奖励获得",
|
Remark: "年兽活动-领取签到奖励获得",
|
||||||
})
|
})
|
||||||
|
|
@ -707,7 +750,7 @@ func CSNianChange(s *netlib.Session, packetid int, data interface{}, sid int64)
|
||||||
Platform: p.Platform,
|
Platform: p.Platform,
|
||||||
SnId: p.SnId,
|
SnId: p.SnId,
|
||||||
Change: items,
|
Change: items,
|
||||||
GainWay: common.GainWayNianGain,
|
GainWay: common.GainWayNianGain_Change,
|
||||||
Operator: "system",
|
Operator: "system",
|
||||||
Remark: "年兽活动-兑换",
|
Remark: "年兽活动-兑换",
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue