ios支付

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

@@ -34,8 +34,7 @@ var GlobalMailSpecialPrivilegeCard int32 = 34
 
 var GlobalRuneGiftGoldShopResetVersion int32 = 0
 
-var GlobalMailyuanhangRankAward int32 = 9
-
+//var GlobalMailIdMormalMonthCard int32 = 9
 //var GlobalMailIdVipMonthCard int32 = 10
 
 var GlobalSystemMsgItemList = map[int32]struct{}{} //获得稀有道具播报系统公告
@@ -169,13 +168,15 @@ var GlobalActivities14DaysLogin int32 = 0
 // 百人道场
 var GlobalDaoChang100RewardInterval uint64 = 5 * 60 * 1000
 var GlobalDaoChang100BaseRewardList = map[int32]int32{}
-var GlobalDaoChang100ChallengeCount int32 = 3
+var GlobalDaoChang100ChallengeCount int32 = 6
 var GlobalDaoChang100TotalRewardTime uint64 = 48 * 60 * 60 * 1000
 var GlobalDaoChangBuyCostList []*serverproto.KeyValueType
 var GlobalDaoChangUnlockMapLevelId int32 = 0
 var GlobalDaoChang100BattleCheck []float64 //百人道场最低战力校验配置参数（A1;A2;A3）
 var GlobalArenaBattleCheck []float64       //英灵殿最低战力校验配置参数（A1;A2;A3）
 
+var GlobalMailyuanhangRankAward int32 = 9
+
 // 问卷调查奖励
 var GlobalQuestionRewardList = map[int32]int32{}
 
@@ -214,7 +215,6 @@ var GlobalPetQualityScore []*serverproto.KeyValueType
 // 远航试炼
 var GlobalCrossYuanHangTrialMaxNum int32 = 0         //远航每日出发次数上限
 var GlobalCrossYuanHangTrialRewardNum int32 = 0      //远航打劫获得奖励有效次数（每日重置）
-var GlobalCrossYuanHangTrialRewardNumBuy int32 = 4   //购买远航打劫获得奖励有效次数（每日重置）
 var GlobalCrossYuanHangTrialViewMaxNum int32 = 0     //远航单次同屏所需显示人数上限
 var GlobalCrossYuanHangTrialRankListMaxNum int32 = 0 //远航抢夺排行榜记录数量上限
 var GlobalCrossYuanHangTrialOpenTimeBeginTime string
@@ -223,7 +223,6 @@ var GlobalCrossTopTowerOpenTimeBeginTime string
 var GlobalCrossTopTowerOpenTimeEndTime string
 var GlobalCrossMaxFightPowerRankVal int32
 var GlobalCrossMaxFightPowerFightInfoUpdateTime int32
-var GlobalCrossYuanHangTrialBuyCount map[int32]int32
 
 var GlobalGuildDemonBroadCastLevel int32 = 0
 
@@ -243,7 +242,7 @@ var GlobalWishSlotCost = serverproto.KeyValueType{}
 // 充值钱包
 var GlobalCreditRechargeFactor float32 = 0                  // 充值钱包 免费充值额度神域经验比例
 var GlobalCreditRechargeInitMax int32 = 0                   // 充值钱包 初始化最大额度
-var GlobalRoCoinFactor float32 = 60                         // rmb获得RO币比例系数
+var GlobalRoCoinFactor float32 = 10                         // rmb获得RO币比例系数
 var GlobalFastBattleTime []serverproto.KeyValueType         // 特殊处理使用道具添加战斗倍数时间[道具id:持续时间]
 var GlobalClimbingTowerDayReward []serverproto.KeyValueType // 试炼馈赠（层数：免费充值额度数量）
 var GlobalRoCoinToExp = 1.0                                 // RO币兑换波利商城经验比例
@@ -273,11 +272,6 @@ func convertGlobalCfg() {
 		}
 	}
 
-	GlobalCrossYuanHangTrialBuyCount = make(map[int32]int32, 0)
-	for i := 1; i <= 5; i++ {
-		GlobalCrossYuanHangTrialBuyCount[int32(i)] = int32(200 * i)
-	}
-
 	//玩家发言条件
 	if cfgData, ok := serverproto.GlobalCfgLoader[int32(serverproto.GlobalType_Global_Chat_World_Role_Level)]; ok {
 		strList := strings.Split(cfgData.SVal, ";")

RO_Server_Trunk-branch_0.1.39/roserver/gmweb/msg/web_paymsg.go

@@ -158,6 +158,7 @@ type Extras struct {
 	ServerId    int    `json:"serverId"`
 	Platform    string `json:"platform"`
 	SubPlatform string `json:"subPlatform"`
+	Bima        string `json:"bima"`
 }
 
 // 海外版quick回调
@@ -181,8 +182,8 @@ func WebPayHwQuickNotify(c *gin.Context) {
 	if err != nil {
 		util.ErrorF("支付回调参数解析错误:%v", err)
 	}
-	util.InfoF("支付签名认证:%v", extras)
-	if extras.Platform == "SDKYOUYI_IOS" {
+	util.InfoF("支付签名认证:%v   params:%v", extras, params)
+	if extras.Platform == "SDKYOUYI_IOS" || extras.Bima == "SDKYOUYI_IOS" {
 		util.InfoF("ios 支付签名认证:%v", info)
 		newSign := getMd5Sign("58696021497436514481898335416221", params)
 		if newSign != sign {

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/pbbind_gen.go

@@ -2205,9 +2205,9 @@ func GetMessageHandler(sreviceName string) rocommon.EventCallBack {
 				Handle_GAME_CSMapLevelTypeChangeReq(e)
 			case *SCMapLevelTypeChangeAck:
 				Handle_GAME_SCMapLevelTypeChangeAcK(e)
-			case *CSMapLevelTypeChangeReq:
+			case *CSCrossYuanHangTrialBuyChallengeNumReq:
 				Handle_GAME_CSCrossYuanHangTrialBuyChallengeNumReq(e)
-			case *SCMapLevelTypeChangeAck:
+			case *SCCrossYuanHangTrialBuyChallengeNumAck:
 				Handle_GAME_SCCrossYuanHangTrialBuyChallengeNumAck(e)
 			default:
 				if Handle_GAME_Default != nil {