细节修改

.gitignore

@@ -1 +1,3 @@
 .idea/
+RO_Server_Trunk-branch_0.1.39/roserver/ttt/ansi_file.txt
+RO_Server_Trunk-branch_0.1.39/roserver/ttt/main.go

RO_Server_Trunk-branch_0.1.39/roserver/baseserver/model/base_config_global.go

@@ -48,25 +48,25 @@ var GlobalWorldBossChallengeCount int32 = 0
 var GlobalIncomeTime int32 = 0
 var GlobalIncomeLimitTime int32 = 0
 
-//evil
+// evil
 var GlobalEvilRefreshConsume = map[int32]int32{}
 var GlobalEviChallengeCost int32 = 0
 var GlobalEvilExpLimit int32 = 0
 
-//CreateItemList
+// CreateItemList
 var GlobalCreateItemList = map[int32]int32{}
 var GlobalCreateRoleMailReward = map[int32]int32{}
 
-//SystemMessageType
+// SystemMessageType
 var GlobalSystemMessageTypeArenaWinStreak = 0
 
-//competition
+// competition
 var GlobalCompetitionSectionFactor float32 = 0.75
 var GlobalCompetitionSectionTotal int64 = 750
 var GlobalCompetitionScoreItem = map[int32]*serverproto.KeyValueType{} //通缉令兑换积分
 var GlobalCompetitionScoreItemFactor []*serverproto.KeyValueTypeList   //通缉令兑换积分权重
 
-//guild
+// guild
 var GlobalGuildApplyListMax int32 = 0
 var GlobalGuildVicePreNum int32 = 0
 var GlobalGuildJoinLevel int32 = 0
@@ -81,7 +81,7 @@ var GlobalGuildMaxSearchStringLen int32 = 0
 
 var GlobalGuildHeadFrame int32 = 0
 
-//公会战
+// 公会战
 var GlobalGuildBattleRewardTime uint64 = 5 * 1000 //5s 公会战收益时间间隔(秒)
 var GlobalGuildBattleChallengeNum int32 = 10      //公会战单场挑战次数
 var GlobalGuildBattleBuyChallengeCost uint64 = 0
@@ -90,7 +90,7 @@ var GlobalGuildBattleFightPower int32 = 0
 var GlobalGuildBattleWinMaxScore int32 = 0
 var GlobalGuildBattleRebornCdTime uint64 = 60 * 1000 //虚弱时间
 
-//宠物技能升级消耗(领悟消耗)
+// 宠物技能升级消耗(领悟消耗)
 var GlobalPetSkillUpConsume int32 = 0
 var GlobalPetAdvanceLimit []int32
 var GlobalPetDecomposeItemList = map[int32]*serverproto.KeyValueType{} //分解获得的道具
@@ -104,7 +104,7 @@ var GlobalPetDecomposeMvp = map[uint32]*serverproto.KeyValueType{}    //
 var GlobalPetQiyueUnlockCost []serverproto.KeyValueType               //宠物觉醒槽位解析消耗
 var GlobalPetQiyueMaxSlotNum = 4                                      //宠物觉醒最大可解锁槽位
 var GlobalPetQiyueNatureRate int32 = 1000                             //宠物契约相同属性额外继承属性比例
-//远征之门
+// 远征之门
 var GlobalExpeditionGuildCallForHelpCDTime uint64 = 0
 var GlobalExpeditionGuildHelpNum int32 = 0
 var GlobalExpeditionGuildBeHelpedNum int32 = 0
@@ -112,7 +112,7 @@ var GlobalExpeditionChallengeNum int32 = 0
 var GlobalExpeditionHelpRewardList = map[int32]int32{}
 var GlobalExpeditionResetRankScore int32 = 0
 
-//invitation
+// invitation
 var GlobalInvitationClickNum int32 = 10
 var GlobalInvitationClickMasterRes int32 = 10
 var GlobalInvitationClickMemberRes int32 = 10
@@ -121,7 +121,7 @@ var GlobalQuickBattleTimes int32 = 0
 var GlobalRMBToVipExpRMB int32 = 0
 var GlobalRMBToVipExpVip int32 = 0
 
-//冲榜 爬塔， 道场
+// 冲榜 爬塔， 道场
 var GlobalMailIdRushTower int32 = 11
 var GlobalMailIdRushArena int32 = 12
 var GlobalRushTowerFightCount int32 = 0
@@ -133,14 +133,13 @@ var GlobalMailRushPetRankReward int32 = 24
 var GlobalMailRushSkillBaseReward int32 = 30
 var GlobalMailRushSkillRankReward int32 = 29
 
-//
 var GlobalMailIdRushMap int32 = 15
 var GlobalMailRushMapBaseReward int32 = 16
 
-//冲榜邮件Rank奖励ID
+// 冲榜邮件Rank奖励ID
 var GlobalRushTowerRewardList []*serverproto.KeyValueType //爬塔冲榜奖励
 var GlobalRushArenaRewardList []*serverproto.KeyValueType //英灵殿冲榜奖励
-//冲榜邮件战斗次数奖励ID
+// 冲榜邮件战斗次数奖励ID
 var GlobalMailRushTowerBaseReward int32 = 13
 var GlobalMailRushDaoBaseReward int32 = 14
 
@@ -148,25 +147,25 @@ var GloablMailDivineReward int32 = 27
 
 var GloablMailIdolFansReward int32 = 32
 
-//公会战会长奖励
+// 公会战会长奖励
 var GlobalMailGuildBattlePreReward int32 = 18
 
-//公会战成员奖励
+// 公会战成员奖励
 var GlobalMailGuildBattleMemReward int32 = 19
 
-//积分奖励
+// 积分奖励
 var GlobalMailGuildBattleScoreReward int32 = 20
 
-//击杀奖励
+// 击杀奖励
 var GlobalMailGuildBattleKillerReward int32 = 21
 
-//公会魔王
+// 公会魔王
 var GlobalMailGuildDemonReward int32 = 31
 
-//14天连续登录补领需要金币
+// 14天连续登录补领需要金币
 var GlobalActivities14DaysLogin int32 = 0
 
-//百人道场
+// 百人道场
 var GlobalDaoChang100RewardInterval uint64 = 5 * 60 * 1000
 var GlobalDaoChang100BaseRewardList = map[int32]int32{}
 var GlobalDaoChang100ChallengeCount int32 = 3
@@ -176,18 +175,18 @@ var GlobalDaoChangUnlockMapLevelId int32 = 0
 var GlobalDaoChang100BattleCheck []float64 //百人道场最低战力校验配置参数（A1;A2;A3）
 var GlobalArenaBattleCheck []float64       //英灵殿最低战力校验配置参数（A1;A2;A3）
 
-//问卷调查奖励
+// 问卷调查奖励
 var GlobalQuestionRewardList = map[int32]int32{}
 
 var GlobalKeepSakeCrystalToMaterial = map[int32]int32{}
 var GlobalKeepSakeMaterialToCrystal = map[int32]int32{}
 
-//职业更换
+// 职业更换
 var GlobalReplaceJobMainHeroLevel = 30                      //主角登记
 var GlobalReplaceJobHeroLevel = 30                          //伙伴等级
 var GlobalReplaceJobConsumeList []*serverproto.KeyValueType //更换职业消耗
 
-//作弊处理
+// 作弊处理
 var GlobalCheatBanTime = map[int32]uint64{}
 var GlobalMaxCheatBanTime uint64 = 0
 var GlobalMaxCheatBanNum int32 = 0
@@ -196,7 +195,7 @@ var GlobalCheatPublicChat ConvertCheatMsgData
 
 var GlobalGuildKickMemberCount int32 = 0
 
-//玩家累计充值档位
+// 玩家累计充值档位
 var GlobalTotalRechargeList []*serverproto.KeyValueType
 
 var GlobalExchangeGuildPresident int32 = 7
@@ -211,7 +210,7 @@ var GlobalPetSkillScore int32 = 0
 
 var GlobalPetQualityScore []*serverproto.KeyValueType
 
-//远航试炼
+// 远航试炼
 var GlobalCrossYuanHangTrialMaxNum int32 = 0         //远航每日出发次数上限
 var GlobalCrossYuanHangTrialRewardNum int32 = 0      //远航打劫获得奖励有效次数（每日重置）
 var GlobalCrossYuanHangTrialViewMaxNum int32 = 0     //远航单次同屏所需显示人数上限
@@ -225,7 +224,7 @@ var GlobalCrossMaxFightPowerFightInfoUpdateTime int32
 
 var GlobalGuildDemonBroadCastLevel int32 = 0
 
-//技能装备（神器）重铸
+// 技能装备（神器）重铸
 var GlobalSkillEquipReforgeMinStart int32
 var GlobalSkillEquipReforgePoolList []int32
 var GlobalSkillEquipShiftCost = map[int32]*serverproto.KeyValueType{}
@@ -241,7 +240,7 @@ var GlobalWishSlotCost = serverproto.KeyValueType{}
 // 充值钱包
 var GlobalCreditRechargeFactor float32 = 0                  // 充值钱包 免费充值额度神域经验比例
 var GlobalCreditRechargeInitMax int32 = 0                   // 充值钱包 初始化最大额度
-var GlobalRoCoinFactor float32 = 10                         // rmb获得RO币比例系数
+var GlobalRoCoinFactor float32 = 60                         // rmb获得RO币比例系数
 var GlobalFastBattleTime []serverproto.KeyValueType         // 特殊处理使用道具添加战斗倍数时间[道具id:持续时间]
 var GlobalClimbingTowerDayReward []serverproto.KeyValueType // 试炼馈赠（层数：免费充值额度数量）
 var GlobalRoCoinToExp = 1.0                                 // RO币兑换波利商城经验比例
@@ -908,7 +907,7 @@ func getGlobalCfgValS(idx serverproto.GlobalType) string {
 	return ""
 }
 
-//恶意聊天
+// 恶意聊天
 type ConvertCheatMsgData struct {
 	ChatDuration uint64 //ms
 	Level        int32

RO_Server_Trunk-branch_0.1.39/roserver/config/csv/ActivitiesCfg.csv

@@ -1,142 +1,153 @@
 唯一id,活动类型,活动排序,活动开始时间,活动结束时间,活动解锁条件,活动图片,活动掉落,活动商店ID,是否显示活动Banner,过期活动,合服活动
 Id,Type,Order,StartTime,EndTime,OpenCondition,BG,HdDrop,ActShopID,NeedShow,ExpiredActivities,ServiceMark
 int,int,int,string,string,list,string,list,list,bool,int,int
-1,4,1,3;1;05:00:01,3;14;05:00:00,,ActivityImg/forthnightlogin_cn,,,TRUE,0,
-2,5,2,3;1;05:00:01,3;14;05:00:00,,ActivityImg/fortnighttask_cn,,,TRUE,0,
-5,7,3,1;2020-12-21 05:00:01,1;2031-01-04 05:00:01,,ActivityImg/christmas_cn,146;147;148;149;150;151,,TRUE,0,
-6,4,6,1;2021-02-08 05:00:01,1;2031-02-22 05:00:01,,ActivityImg/newyearlogin_cn,,,TRUE,0,
-7,7,7,1;2021-02-11 05:00:01,1;2031-02-18 05:00:01,,ActivityImg/newyear_cn,154;155;156;157;158,,TRUE,0,
-8,8,8,1;2021-02-08 05:00:01,1;2031-02-22 05:00:01,,ActivityImg/newyearshop_cn,153,9,TRUE,0,
-9,9,9,3;1;05:00:01,3;30;05:00:00,,,40,50,FALSE,0,
-10,7,10,1;2021-02-24 12:00:01,1;2031-03-03 05:00:01,,ActivityImg/naoyuanxiao_cn,166;167;168;169;170;171;172;173;174;15025,,TRUE,0,
-11,8,11,3;1;05:00:01,3;15;05:00:01,,ActivityImg/beginershop_cn,175,10,TRUE,0,
-13,4,13,1;2021-03-06 12:00:01,1;2031-03-20 05:00:01,,ActivityImg/arborday_cn,178;179;180;181;182;184;185;186;187;188;189,,TRUE,0,
-14,8,14,1;2021-03-12 05:00:01,1;2031-03-20 05:00:01,,,183,,FALSE,0,
-15,0,15,1;2021-04-01 05:00:01,1;2031-04-09 05:00:01,,ActivityImg/qingming_cn,203,,TRUE,0,
-17,11,18,2;16;05:00:01,2;23;05:00:01,,ActivityImg/petexchange_01_cn,,,TRUE,0,
-18,11,18,2;23;05:00:30,2;30;05:00:01,,ActivityImg/petexchange_02_cn,,,TRUE,0,
-19,11,18,2;30;05:00:30,2;37;05:00:01,,ActivityImg/petexchange_03_cn,,,TRUE,0,
-20,11,18,2;37;05:00:30,2;44;05:00:01,,ActivityImg/petexchange_04_cn,,,TRUE,0,
-21,11,18,2;44;05:00:30,2;51;05:00:01,,ActivityImg/petexchange_05_cn,,,TRUE,0,
-22,11,18,2;51;05:00:30,2;58;05:00:01,,ActivityImg/petexchange_06_cn,,,TRUE,0,
-23,11,18,2;58;05:00:30,2;65;05:00:01,,ActivityImg/petexchange_07_cn,,,TRUE,0,
-24,11,18,2;65;05:00:30,2;72;05:00:01,,ActivityImg/petexchange_08_cn,,,TRUE,0,
-25,11,18,2;72;05:00:30,2;79;05:00:01,,ActivityImg/petexchange_09_cn,,,TRUE,0,
-26,11,18,2;79;05:00:30,2;86;05:00:01,,ActivityImg/petexchange_01_cn,,,TRUE,0,
-27,11,18,2;86;05:00:30,2;93;05:00:01,,ActivityImg/petexchange_02_cn,,,TRUE,0,
-28,11,18,2;93;05:00:30,2;100;05:00:01,,ActivityImg/petexchange_03_cn,,,TRUE,0,
-29,11,18,2;100;05:00:30,2;107;05:00:01,,ActivityImg/petexchange_04_cn,,,TRUE,0,
-30,11,18,2;107;05:00:30,2;114;05:00:01,,ActivityImg/petexchange_05_cn,,,TRUE,0,
-31,11,18,2;114;05:00:30,2;121;05:00:01,,ActivityImg/petexchange_06_cn,,,TRUE,0,
-32,11,18,2;121;05:00:30,2;128;05:00:01,,ActivityImg/petexchange_07_cn,,,TRUE,0,
-33,11,18,2;128;05:00:30,2;135;05:00:01,,ActivityImg/petexchange_08_cn,,,TRUE,0,
-34,11,18,2;135;05:00:30,2;142;05:00:01,,ActivityImg/petexchange_09_cn,,,TRUE,0,
-35,12,17,2;16;05:00:30,2;23;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-36,12,17,2;23;05:00:30,2;30;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-37,12,17,2;30;05:00:30,2;37;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-38,12,17,2;37;05:00:30,2;44;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-39,12,17,2;44;05:00:30,2;51;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-40,12,17,2;51;05:00:30,2;58;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-41,12,17,2;58;05:00:30,2;65;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-42,12,17,2;65;05:00:30,2;72;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-43,12,17,2;72;05:00:30,2;79;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-44,12,17,2;79;05:00:30,2;86;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-45,12,17,2;86;05:00:30,2;93;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-46,12,17,2;93;05:00:30,2;100;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-47,12,17,2;100;05:00:30,2;107;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-48,12,17,2;107;05:00:30,2;114;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-49,12,17,2;114;05:00:30,2;121;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-50,12,17,2;121;05:00:30,2;128;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-51,12,17,2;128;05:00:30,2;135;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-52,12,17,2;135;05:00:30,2;142;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-53,12,17,2;142;05:00:30,2;149;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-54,12,17,2;149;05:00:30,2;156;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-55,8,19,2;15;05:00:01,2;3650;05:00:01,,ActivityImg/beginershop_cn,,11,FALSE,0,
-56,4,20,1;2021-04-24 05:00:01,1;2031-05-08 05:00:01,,ActivityImg/laodongjie_cn,,,TRUE,0,
-57,12,21,1;2021-05-01 05:00:01,1;2031-05-08 05:00:01,,ActivityImg/activitycharge_cn,,,TRUE,0,
-58,11,22,1;2021-05-01 05:00:01,1;2031-05-15 05:00:01,,ActivityImg/cardexchange_01_cn,210,,TRUE,0,
-60,10,1,2;3;05:00:01,2;10;05:00:01,,ActivityImg/goddessday_cn,206;207,,TRUE,0,
-65,10,1,2;17;05:00:05,2;24;05:00:01,,ActivityImg/goddessday7_cn,223;224,,TRUE,0,
-63,7,7,1;2021-05-15 05:00:01,1;2031-05-22 05:00:01,,ActivityImg/holiday520_cn,215;216;217;218;219,,TRUE,0,
-64,13,7,1;2021-05-31 05:00:01,1;2031-06-07 05:00:01,,ActivityImg/childrensday_cn,220,,TRUE,0,
-66,10,1,2;10;05:00:05,2;17;05:00:01,,ActivityImg/goddessday3_cn,221;222,,TRUE,0,
-67,11,18,2;142;05:00:30,2;149;05:00:01,,ActivityImg/petexchange_01_cn,,,TRUE,0,
-68,11,18,2;149;05:00:30,2;156;05:00:01,,ActivityImg/petexchange_02_cn,,,TRUE,0,
-69,11,18,2;156;05:00:30,2;163;05:00:01,,ActivityImg/petexchange_03_cn,,,TRUE,0,
-70,11,18,2;163;05:00:30,2;170;05:00:01,,ActivityImg/petexchange_04_cn,,,TRUE,0,
-71,11,18,2;170;05:00:30,2;177;05:00:01,,ActivityImg/petexchange_05_cn,,,TRUE,0,
-72,11,18,2;177;05:00:30,2;184;05:00:01,,ActivityImg/petexchange_06_cn,,,TRUE,0,
-73,11,18,2;184;05:00:30,2;191;05:00:01,,ActivityImg/petexchange_07_cn,,,TRUE,0,
-74,11,18,2;191;05:00:30,2;198;05:00:01,,ActivityImg/petexchange_08_cn,,,TRUE,0,
-75,11,18,2;198;05:00:30,2;205;05:00:01,,ActivityImg/petexchange_09_cn,,,TRUE,0,
-76,12,17,2;156;05:00:30,2;163;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-77,12,17,2;163;05:00:30,2;170;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-78,12,17,2;170;05:00:30,2;177;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-79,12,17,2;177;05:00:30,2;184;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-80,12,17,2;184;05:00:30,2;191;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-81,12,17,2;191;05:00:30,2;198;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-82,12,17,2;198;05:00:30,2;205;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-83,12,17,2;205;05:00:30,2;212;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-84,12,17,2;212;05:00:30,2;219;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-85,12,17,2;219;05:00:30,2;226;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-86,12,21,1;2021-06-11 05:00:01,1;2031-06-18 05:00:01,,ActivityImg/duanwujierecharge_cn,,,TRUE,0,
-88,4,13,1;2021-06-11 05:00:01,1;2031-06-18 05:00:01,,ActivityImg/duanwujie_cn,232;233;234,,TRUE,0,
-89,10,1,2;24;05:00:05,2;31;05:00:01,,ActivityImg/goddessday9_cn,235;236,,TRUE,0,
-90,12,1,1;2021-06-29 05:00:01,1;2031-07-04 05:00:01,,ActivityImg/summerparty_cn,,,TRUE,0,
-91,12,1,1;2021-07-04 05:00:10,1;2031-07-09 05:00:01,,ActivityImg/summerparty_cn,,,TRUE,0,
-92,15,2,2;1;05:00:30;2021-08-31 05:00:10,2;46;05:00:01,,ActivityImg/summerlogin_cn,,,TRUE,1,
-93,12,1,2;1;05:00:30;2021-07-31 05:00:10,2;26;05:00:01,,ActivityImg/summercharge_cn,,,TRUE,1,
-94,14,1,2;31;05:00:01,2;45;05:00:01,,ActivityImg/artifactsummon_cn,267,,TRUE,0,
-99,10,1,2;31;05:00:01,2;38;05:00:01,,ActivityImg/goddessday11_cn,247;246,,TRUE,0,
-96,11,18,2;205;05:00:30,2;212;05:00:01,,ActivityImg/petexchange_10_cn,,,TRUE,0,
-97,11,18,2;212;05:00:30,2;219;05:00:01,,ActivityImg/petexchange_11_cn,,,TRUE,0,
-98,11,18,2;219;05:00:30,2;226;05:00:01,,ActivityImg/petexchange_12_cn,,,TRUE,0,
-101,12,1,1;2021-08-21 05:00:01,1;2021-09-01 05:00:01,,ActivityImg/summergoldaward_cn,,,TRUE,0,
-102,7,1,1;2021-08-26 05:00:01,1;2031-09-07 05:00:01,,ActivityImg/qiugaoqishuang_cn,250;251;252;253;254,,TRUE,0,
-103,14,1,2;45;05:00:01;2099-01-01 05:00:10,2;59;05:00:01,,ActivityImg/artifactsummon3_cn,255,,TRUE,1,
-141,10,1,2;45;05:00:00,2;52;05:00:00,,ActivityImg/goddessday16_cn,269;270,,TRUE,1,
-105,12,2,2;226;05:00:30,2;233;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-106,12,2,2;233;05:00:30,2;240;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-107,12,2,2;240;05:00:30,2;247;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-108,12,2,2;247;05:00:30,2;254;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-109,12,2,2;254;05:00:30,2;261;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-110,12,2,2;261;05:00:30,2;268;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-111,12,2,2;268;05:00:30,2;275;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-112,12,2,2;275;05:00:30,2;282;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-113,12,2,2;282;05:00:30,2;289;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-114,12,2,2;289;05:00:30,2;296;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-115,11,1,2;226;05:00:30,2;233;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-116,11,1,2;233;05:00:30,2;240;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-117,11,1,2;240;05:00:30,2;247;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-118,11,1,2;247;05:00:30,2;254;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-119,10,1,2;38;05:00:05,2;45;05:00:01,,ActivityImg/goddessday14_cn,258;259,,TRUE,0,
-120,4,1,1;2021-09-28 05:00:01,1;2021-10-12 05:00:01,,ActivityImg/guoqingjie_cn,,,TRUE,0,
-121,12,17,2;2;05:00:01,2;9;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-122,12,17,2;9;05:00:30,2;16;05:00:01,,ActivityImg/kingtask_cn,,,TRUE,0,
-123,12,1,1;2021-09-21 05:00:01,1;2021-10-01 05:00:01,,ActivityImg/cumulative_recharge1_cn,,,TRUE,0,
-124,12,1,1;2021-10-01 05:00:10,1;2021-10-08 05:00:01,,ActivityImg/cumulative_recharge2_cn,,,TRUE,0,
-125,7,1,1;2021-10-09 05:00:01,1;2031-10-16 05:00:01,,ActivityImg/petexchange_15_cn,265;266,,TRUE,0,
-126,10,1,2;52;05:00:05,2;59;05:00:01,,ActivityImg/goddessday15_cn,262;263,,TRUE,0,
-127,11,1,2;254;05:00:30,2;261;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-128,11,1,2;261;05:00:30,2;268;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-129,11,1,2;268;05:00:30,2;275;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-130,11,1,2;275;05:00:30,2;282;05:00:01,,ActivityImg/petexchange_13_cn,,,TRUE,0,
-131,12,1,1;2021-10-19 05:00:01,1;2021-11-01 05:00:01,,ActivityImg/compositetask1_cn,,,TRUE,0,
-132,12,1,1;2021-10-22 05:00:10,1;2021-11-01 05:00:01,,ActivityImg/monthrecharge_cn,,,TRUE,0,
-133,12,2,1;2021-10-19 05:00:01,1;2021-11-01 05:00:01,,ActivityImg/compositetask2_cn,,,TRUE,0,
-134,12,1,1;2021-11-05 05:00:10,1;2021-11-10 05:00:01,,ActivityImg/shuang11charge1_cn,,,TRUE,0,
-135,12,1,1;2021-11-10 05:00:10,1;2021-11-13 05:00:01,,ActivityImg/shuang11charge2_cn,,,TRUE,0,
-136,12,1,1;2021-11-13 05:00:10,1;2021-11-18 05:00:01,,ActivityImg/shuang11charge3_cn,,,TRUE,0,
-137,4,2,1;2021-11-05 05:00:01,1;2031-11-12 05:00:01,,ActivityImg/shuang11Signin_cn,,,TRUE,0,
-138,12,1,1;2021-11-18 05:00:10,1;2021-11-24 05:00:01,,ActivityImg/monthrecharge_cn,,,TRUE,0,
-139,7,1,1;2021-12-06 05:00:01,1;2031-12-14 05:00:01,,ActivityImg/petexchange_16_cn,271;272,,TRUE,0,
-142,10,1,2;59;05:00:05,2;66;05:00:01,,ActivityImg/goddessday18_cn,275;276,,TRUE,0,
-143,12,1,1;2021-12-01 05:00:10,1;2021-12-11 05:00:01,,ActivityImg/monthrecharge_cn,,,TRUE,0,
-144,12,1,1;2021-12-11 05:00:10,1;2021-12-18 05:00:01,,ActivityImg/shuang12charge1_cn,,,TRUE,0,
-145,12,1,1;2021-12-18 05:00:10,1;2021-12-25 05:00:01,,ActivityImg/shuang12charge2_cn,,,TRUE,0,
-146,14,1,2;1;05:00:01,2;61;05:00:01,,ActivityImg/superartifactsummon_cn,,,TRUE,0,1
-147,12,2,2;1;05:00:01,2;30;05:00:01,,ActivityImg/supercharge_cn,,,TRUE,0,1
-148,4,3,2;1;05:00:01,2;15;05:00:01,,ActivityImg/forthnightlogin1_cn,,,TRUE,0,1
-10000,21,2,2;2;05:00:01,2;2;08:00:01,,ActivityImg/dailyrecharge_bt_cn,,,TRUE,0,
-10001,20,1,2;2;05:00:01,2;2;08:00:01,,ActivityImg/dailyrecharge7_bt_cn,,,TRUE,0,
-10002,22,3,2;2;05:00:01,2;2;08:00:01,,ActivityImg/smasheggs_bt_cn,,,TRUE,0,
+1,4,1,3;1;05:00:01,3;14;05:00:00,,ActivityImg/forthnightlogin_cn,,,true,0,
+2,5,2,3;1;05:00:01,3;14;05:00:00,,ActivityImg/fortnighttask_cn,,,true,0,
+3,6,5,4,4,,ActivityImg/firstrecharge02_cn,,,true,0,
+4,2,4,,,,ActivityImg/dailyrecharge_cn,,,true,0,
+5,7,3,1;2020-12-21 05:00:01,1;2021-01-04 05:00:01,,ActivityImg/christmas_cn,146;147;148;149;150;151,,true,0,
+6,4,6,1;2021-02-08 05:00:01,1;2021-02-22 05:00:01,,ActivityImg/newyearlogin_cn,,,true,0,
+7,7,7,1;2021-02-11 05:00:01,1;2021-02-18 05:00:01,,ActivityImg/newyear_cn,154;155;156;157;158,,true,0,
+8,8,8,1;2021-02-08 05:00:01,1;2021-02-22 05:00:01,,ActivityImg/newyearshop_cn,153,9,true,0,
+9,9,9,3;1;05:00:01,3;7;05:00:00,,,40,50,false,0,
+10,7,10,1;2021-02-24 12:00:01,1;2021-03-03 05:00:01,,ActivityImg/naoyuanxiao_cn,166;167;168;169;170;171;172;173;174;15025,,true,0,
+11,8,11,2;1;05:00:01,2;15;05:00:01,,ActivityImg/beginershop_cn,175,10,true,0,
+12,10,12,1;2021-03-06 12:00:01,1;2021-03-20 05:00:01,,ActivityImg/goddessday_cn,176;177,,true,0,
+13,4,13,1;2021-03-06 12:00:01,1;2021-03-20 05:00:01,,ActivityImg/arborday_cn,178;179;180;181;182;184;185;186;187;188;189,,true,0,
+14,8,14,1;2021-03-12 05:00:01,1;2021-03-20 05:00:01,,,183,,false,0,
+15,0,15,1;2021-04-01 05:00:01,1;2021-04-09 05:00:01,,ActivityImg/qingming_cn,203,,true,0,
+16,10,16,1;2021-04-12 12:00:01,1;2021-04-20 05:00:01,,ActivityImg/goddessday2_cn,204;205,,true,0,
+17,11,18,2;16;05:00:01,2;23;05:00:01,,ActivityImg/petexchange_01_cn,,,true,0,
+18,11,18,2;23;05:00:30,2;30;05:00:01,,ActivityImg/petexchange_02_cn,,,true,0,
+19,11,18,2;30;05:00:30,2;37;05:00:01,,ActivityImg/petexchange_03_cn,,,true,0,
+20,11,18,2;37;05:00:30,2;44;05:00:01,,ActivityImg/petexchange_04_cn,,,true,0,
+21,11,18,2;44;05:00:30,2;51;05:00:01,,ActivityImg/petexchange_05_cn,,,true,0,
+22,11,18,2;51;05:00:30,2;58;05:00:01,,ActivityImg/petexchange_06_cn,,,true,0,
+23,11,18,2;58;05:00:30,2;65;05:00:01,,ActivityImg/petexchange_07_cn,,,true,0,
+24,11,18,2;65;05:00:30,2;72;05:00:01,,ActivityImg/petexchange_08_cn,,,true,0,
+25,11,18,2;72;05:00:30,2;79;05:00:01,,ActivityImg/petexchange_09_cn,,,true,0,
+26,11,18,2;79;05:00:30,2;86;05:00:01,,ActivityImg/petexchange_01_cn,,,true,0,
+27,11,18,2;86;05:00:30,2;93;05:00:01,,ActivityImg/petexchange_02_cn,,,true,0,
+28,11,18,2;93;05:00:30,2;100;05:00:01,,ActivityImg/petexchange_03_cn,,,true,0,
+29,11,18,2;100;05:00:30,2;107;05:00:01,,ActivityImg/petexchange_04_cn,,,true,0,
+30,11,18,2;107;05:00:30,2;114;05:00:01,,ActivityImg/petexchange_05_cn,,,true,0,
+31,11,18,2;114;05:00:30,2;121;05:00:01,,ActivityImg/petexchange_06_cn,,,true,0,
+32,11,18,2;121;05:00:30,2;128;05:00:01,,ActivityImg/petexchange_07_cn,,,true,0,
+33,11,18,2;128;05:00:30,2;135;05:00:01,,ActivityImg/petexchange_08_cn,,,true,0,
+34,11,18,2;135;05:00:30,2;142;05:00:01,,ActivityImg/petexchange_09_cn,,,true,0,
+35,12,17,2;16;05:00:30,2;23;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+36,12,17,2;23;05:00:30,2;30;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+37,12,17,2;30;05:00:30,2;37;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+38,12,17,2;37;05:00:30,2;44;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+39,12,17,2;44;05:00:30,2;51;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+40,12,17,2;51;05:00:30,2;58;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+41,12,17,2;58;05:00:30,2;65;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+42,12,17,2;65;05:00:30,2;72;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+43,12,17,2;72;05:00:30,2;79;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+44,12,17,2;79;05:00:30,2;86;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+45,12,17,2;86;05:00:30,2;93;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+46,12,17,2;93;05:00:30,2;100;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+47,12,17,2;100;05:00:30,2;107;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+48,12,17,2;107;05:00:30,2;114;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+49,12,17,2;114;05:00:30,2;121;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+50,12,17,2;121;05:00:30,2;128;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+51,12,17,2;128;05:00:30,2;135;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+52,12,17,2;135;05:00:30,2;142;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+53,12,17,2;142;05:00:30,2;149;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+54,12,17,2;149;05:00:30,2;156;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+55,8,19,2;15;05:00:01,2;3650;05:00:01,,ActivityImg/beginershop_cn,,11,false,0,
+56,4,20,1;2021-04-24 05:00:01,1;2021-05-08 05:00:01,,ActivityImg/laodongjie_cn,,,true,0,
+57,12,21,1;2021-05-01 05:00:01,1;2021-05-08 05:00:01,,ActivityImg/activitycharge_cn,,,true,0,
+58,11,22,1;2021-05-01 05:00:01,1;2021-05-15 05:00:01,,ActivityImg/cardexchange_01_cn,210,,true,0,
+59,10,16,1;2021-05-01 05:00:01,1;2021-05-15 05:00:01,,ActivityImg/goddessday3_cn,208;209,,true,0,
+60,10,16,2;7;05:00:01,2;15;05:00:01,,ActivityImg/goddessday_cn,206;207,,true,0,
+61,10,16,1;2021-04-24 05:00:01,1;2021-05-01 05:00:01,,ActivityImg/goddessday4_cn,211;212,,true,0,
+62,10,16,1;2021-05-15 05:00:01,1;2021-05-29 05:00:01,,ActivityImg/goddessday5_cn,213;214,,true,0,
+63,7,7,1;2021-05-15 05:00:01,1;2021-05-22 05:00:01,,ActivityImg/holiday520_cn,215;216;217;218;219,,true,0,
+64,13,7,1;2021-05-31 05:00:01,1;2021-06-07 05:00:01,,ActivityImg/childrensday_cn,220,,true,0,
+65,10,16,2;22;05:00:01,2;29;05:00:01,,ActivityImg/goddessday7_cn,223;224,,true,0,
+66,10,16,2;15;05:00:01,2;22;05:00:01,,ActivityImg/goddessday3_cn,221;222,,true,0,
+67,11,18,2;142;05:00:30,2;149;05:00:01,,ActivityImg/petexchange_01_cn,,,true,0,
+68,11,18,2;149;05:00:30,2;156;05:00:01,,ActivityImg/petexchange_02_cn,,,true,0,
+69,11,18,2;156;05:00:30,2;163;05:00:01,,ActivityImg/petexchange_03_cn,,,true,0,
+70,11,18,2;163;05:00:30,2;170;05:00:01,,ActivityImg/petexchange_04_cn,,,true,0,
+71,11,18,2;170;05:00:30,2;177;05:00:01,,ActivityImg/petexchange_05_cn,,,true,0,
+72,11,18,2;177;05:00:30,2;184;05:00:01,,ActivityImg/petexchange_06_cn,,,true,0,
+73,11,18,2;184;05:00:30,2;191;05:00:01,,ActivityImg/petexchange_07_cn,,,true,0,
+74,11,18,2;191;05:00:30,2;198;05:00:01,,ActivityImg/petexchange_08_cn,,,true,0,
+75,11,18,2;198;05:00:30,2;205;05:00:01,,ActivityImg/petexchange_09_cn,,,true,0,
+76,12,17,2;156;05:00:30,2;163;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+77,12,17,2;163;05:00:30,2;170;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+78,12,17,2;170;05:00:30,2;177;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+79,12,17,2;177;05:00:30,2;184;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+80,12,17,2;184;05:00:30,2;191;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+81,12,17,2;191;05:00:30,2;198;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+82,12,17,2;198;05:00:30,2;205;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+83,12,17,2;205;05:00:30,2;212;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+84,12,17,2;212;05:00:30,2;219;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+85,12,17,2;219;05:00:30,2;226;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+86,12,21,1;2021-06-11 05:00:01,1;2021-06-18 05:00:01,,ActivityImg/duanwujierecharge_cn,,,true,0,
+87,10,16,1;2021-06-11 05:00:01,1;2021-06-18 05:00:01,,ActivityImg/goddessday8_cn,230;231,,true,0,
+88,4,13,1;2021-06-11 05:00:01,1;2021-06-18 05:00:01,,ActivityImg/duanwujie_cn,232;233;234,,true,0,
+89,10,16,2;29;05:00:01,2;36;05:00:01,,ActivityImg/goddessday9_cn,235;236,,true,0,
+90,12,1,1;2021-06-29 05:00:01,1;2021-07-04 05:00:01,,ActivityImg/summerparty_cn,,,true,0,
+91,12,1,1;2021-07-04 05:00:10,1;2021-07-09 05:00:01,,ActivityImg/summerparty_cn,,,true,0,
+92,15,2,2;1;05:00:30;2021-08-31 05:00:10,2;46;05:00:01,,ActivityImg/summerlogin_cn,,,true,1,
+93,12,1,2;1;05:00:30;2021-07-31 05:00:10,2;26;05:00:01,,ActivityImg/summercharge_cn,,,true,1,
+94,14,1,2;31;05:00:01,2;45;05:00:01,,ActivityImg/artifactsummon_cn,267,,true,0,
+95,10,16,1;2021-07-20 05:00:01,1;2021-07-28 05:00:01,,ActivityImg/goddessday10_cn,240;241,,true,0,
+96,11,18,2;205;05:00:30,2;212;05:00:01,,ActivityImg/petexchange_10_cn,,,true,0,
+97,11,18,2;212;05:00:30,2;219;05:00:01,,ActivityImg/petexchange_11_cn,,,true,0,
+98,11,18,2;219;05:00:30,2;226;05:00:01,,ActivityImg/petexchange_12_cn,,,true,0,
+99,10,16,2;36;05:00:01,2;43;05:00:01,,ActivityImg/goddessday11_cn,247;246,,true,0,
+100,10,16,1;2021-08-14 05:00:01,1;2021-08-22 05:00:01,,ActivityImg/goddessday12_cn,248;249,,true,0,
+101,12,1,1;2021-08-21 05:00:01,1;2021-09-01 05:00:01,,ActivityImg/summergoldaward_cn,,,true,0,
+102,7,1,1;2021-08-26 05:00:01,1;2021-09-07 05:00:01,,ActivityImg/qiugaoqishuang_cn,250;251;252;253;254,,true,0,
+103,14,1,2;45;05:00:01;2099-01-01 05:00:10,2;59;05:00:01,,ActivityImg/artifactsummon3_cn,255,,true,1,
+104,10,16,1;2021-09-11 05:00:01,1;2021-09-19 05:00:01,,ActivityImg/goddessday13_cn,256;257,,true,0,
+105,12,2,2;226;05:00:30,2;233;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+106,12,2,2;233;05:00:30,2;240;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+107,12,2,2;240;05:00:30,2;247;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+108,12,2,2;247;05:00:30,2;254;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+109,12,2,2;254;05:00:30,2;261;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+110,12,2,2;261;05:00:30,2;268;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+111,12,2,2;268;05:00:30,2;275;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+112,12,2,2;275;05:00:30,2;282;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+113,12,2,2;282;05:00:30,2;289;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+114,12,2,2;289;05:00:30,2;296;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+115,11,1,2;226;05:00:30,2;233;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+116,11,1,2;233;05:00:30,2;240;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+117,11,1,2;240;05:00:30,2;247;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+118,11,1,2;247;05:00:30,2;254;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+119,10,16,2;43;05:00:01,2;50;05:00:01,,ActivityImg/goddessday14_cn,258;259,,true,0,
+120,4,1,1;2021-09-28 05:00:01,1;2021-10-12 05:00:01,,ActivityImg/guoqingjie_cn,,,true,0,
+121,12,17,2;2;05:00:01,2;9;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+122,12,17,2;9;05:00:30,2;16;05:00:01,,ActivityImg/kingtask_cn,,,true,0,
+123,12,1,1;2021-09-21 05:00:01,1;2021-10-01 05:00:01,,ActivityImg/cumulative_recharge1_cn,,,true,0,
+124,12,1,1;2021-10-01 05:00:10,1;2021-10-08 05:00:01,,ActivityImg/cumulative_recharge2_cn,,,true,0,
+125,7,1,1;2021-10-09 05:00:01,1;2021-10-16 05:00:01,,ActivityImg/petexchange_15_cn,265;266,,true,0,
+126,10,16,1;2021-10-12 05:00:01,1;2021-10-22 05:00:01,,ActivityImg/goddessday15_cn,262;263,,true,0,
+127,11,1,2;254;05:00:30,2;261;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+128,11,1,2;261;05:00:30,2;268;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+129,11,1,2;268;05:00:30,2;275;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+130,11,1,2;275;05:00:30,2;282;05:00:01,,ActivityImg/petexchange_13_cn,,,true,0,
+131,12,1,1;2021-10-19 05:00:01,1;2021-11-01 05:00:01,,ActivityImg/compositetask1_cn,,,true,0,
+132,12,1,1;2021-10-22 05:00:10,1;2021-11-01 05:00:01,,ActivityImg/monthrecharge_cn,,,true,0,
+133,12,2,1;2021-10-19 05:00:01,1;2021-11-01 05:00:01,,ActivityImg/compositetask2_cn,,,true,0,
+134,12,1,1;2021-11-05 05:00:10,1;2021-11-10 05:00:01,,ActivityImg/shuang11charge1_cn,,,true,0,
+135,12,1,1;2021-11-10 05:00:10,1;2021-11-13 05:00:01,,ActivityImg/shuang11charge2_cn,,,true,0,
+136,12,1,1;2021-11-13 05:00:10,1;2021-11-18 05:00:01,,ActivityImg/shuang11charge3_cn,,,true,0,
+137,4,2,1;2021-11-05 05:00:01,1;2021-11-12 05:00:01,,ActivityImg/shuang11Signin_cn,,,true,0,
+138,12,1,1;2021-11-18 05:00:10,1;2021-11-24 05:00:01,,ActivityImg/monthrecharge_cn,,,true,0,
+139,7,1,1;2021-12-06 05:00:01,1;2021-12-14 05:00:01,,ActivityImg/petexchange_16_cn,271;272,,true,0,
+141,10,1,2;49;05:00:00,2;56;05:00:00,,ActivityImg/goddessday16_cn,269;270,,true,1,
+142,10,1,1;2021-11-30 05:00:01,1;2021-12-08 05:00:01,,ActivityImg/goddessday18_cn,275;276,,true,0,
+143,12,1,1;2021-12-01 05:00:10,1;2021-12-11 05:00:01,,ActivityImg/monthrecharge_cn,,,true,0,
+140,10,1,2;56;05:00:00,2;63;05:00:00,,ActivityImg/goddessday17_cn,273;274,,true,1,
+144,12,1,1;2021-12-11 05:00:10,1;2021-12-18 05:00:01,,ActivityImg/shuang12charge1_cn,,,true,0,
+145,12,1,1;2021-12-18 05:00:10,1;2021-12-25 05:00:01,,ActivityImg/shuang12charge2_cn,,,true,0,
+146,14,1,2;1;05:00:01,2;61;05:00:01,,ActivityImg/superartifactsummon_cn,,,true,0,1
+147,12,2,2;1;05:00:01,2;30;05:00:01,,ActivityImg/supercharge_cn,,,true,0,1
+148,4,3,2;1;05:00:01,2;15;05:00:01,,ActivityImg/forthnightlogin1_cn,,,true,0,1
+149,14,1,2;59;05:00:01;2099-01-01 05:00:10,2;73;05:00:01,,ActivityImg/artifactsummon4_cn,277,,true,1,
+150,12,1,1;2021-12-25 05:00:10,1;2022-01-01 05:00:01,,ActivityImg/christmascharge_cn,,,true,0,

RO_Server_Trunk-branch_0.1.39/roserver/config/csv/GlobalCfg.csv

@@ -340,7 +340,7 @@ int,int,string,float
 353,,1:10,
 354,500,,
 355,,20003:900,
-356,,1:10,
+356,,1:60,
 357,,10:50;150:150;300:175;450:200;600:225;750:250;900:275;1050:300;1200:325;1350:350;1500:375;1600:400;1700:425;1800:450;1900:475;2000:500,
 358,,1:1,
 359,7,,

RO_Server_Trunk-branch_0.1.39/roserver/config/csv/PrivilegeCardCfg.csv

@@ -1,5 +1,5 @@
 等级,价格,解锁条件,战斗X2加速,特权每日礼包,充值钱包额度,购买奖励显示
 Lv,RMB,UnlockCond,QuickBattle,Reward,PurseQuota,BuyReward
 int,float,list,int,list,int,list
-1,4.99,,1,54:100;5:50000;512:5,1000,54:380;26:380
+1,4.99,,1,54:100;5:50000;512:5,1000,54:380;26:300
 2,49.99,11;40001,1,54:300;5:100000;512:10;531:3,-1,54:3280;26:3280

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -3,6 +3,7 @@ package model
 import (
 	"errors"
 	"fmt"
+	"math"
 	"math/rand"
 	"reflect"
 	_ "rocommon/rpc"
@@ -3521,7 +3522,7 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 		}
 		// 按照配置比例获取RO币
 		if model.GlobalRoCoinFactor > 0 {
-			tmpRoCoin := payOrderInfo.Amount * model.GlobalRoCoinFactor
+			tmpRoCoin := math.Ceil(float64(payOrderInfo.Amount)) * float64(model.GlobalRoCoinFactor)
 			payOrderInfo.RewardList = append(payOrderInfo.RewardList, &serverproto.KeyValueType{
 				Key:   int32(serverproto.ResType_Res_ROCoin),
 				Value: int32(tmpRoCoin),

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_bt.go

@@ -550,7 +550,7 @@ func (this *RoleBT) FirstRechargeReward(rewardIdx int32) serverproto.ErrorCode {
 		return serverproto.ErrorCode_ERROR_BT_FIRSTRECHARGE_REWARDED
 	}
 	//判断累计充值是否达到(花钱购买累计充值+免费充值额度使用) 配置是*100的，校验也*100
-	totalRecharge := (uint64(this.role.GetTotalRecharge()) + uint64(this.role.GetBTJiaTotalRecharge())) * 100
+	totalRecharge := (uint64(this.role.GetTotalRecharge())+uint64(this.role.GetBTJiaTotalRecharge()))*100 + 2
 
 	rewardCfgData := model.ConvertBTFirstRecharge.RewardList[rewardIdx-1]
 	if totalRecharge < uint64(rewardCfgData.RewardCondition) {