11

RO_Server_Trunk-branch_0.1.39/roserver/auth/model/auth_msg.go

@@ -119,7 +119,7 @@ func init() {
 				ev.Session().Send(loginNtf)
 				//LoginVerifyDNSign(cliId.SessID, cliId.ServiceID, msg.Platform, msg.PlatformToken, msg.OpenId, msg.CryptPass)
 			case model.SDKPlatform_Xuan_Ios:
-				fallthrough
+				LoginVerifyDNGoogleIosSign(cliId.SessID, cliId.ServiceID, msg.Platform, msg.PlatformToken, msg.OpenId, msg.CryptPass)
 			case model.SDKPlatform_Xuan_Android:
 				LoginVerifyDNSign(cliId.SessID, cliId.ServiceID, msg.Platform, msg.PlatformToken, msg.OpenId, msg.CryptPass)
 			case model.SDKPlatform_Xuan_Google_Android:

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

@@ -230,7 +230,7 @@ func (this *ItemAction) add(configId int32, count int32) bool {
 	}
 
 	//当前堆叠加数量够了后就不统计了(叠加数量大时有会有问题)
-	util.ErrorF("uid=%v ItemAction-add cfgid=%v curItemNum=%v addCount=%v", this.roleBag.role.GetUUid(),
+	util.InfoF("uid=%v ItemAction-add cfgid=%v curItemNum=%v addCount=%v", this.roleBag.role.GetUUid(),
 		configId, oldItemNum, tmpCount)
 
 	//if oldItemNum > 0 {

RO_Server_Trunk-branch_0.1.39/roserver/game/msg/role_msg.go

@@ -3783,7 +3783,7 @@ func init() {
 			role.ReplayGate(ackMsg, true)
 			return
 		}
-		role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, true)
+		role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, false)
 	})
 
 	serverproto.Handle_GAME_SSPayOrderCreateReq = model.HandleBackendMessage(func(ev rocommon.ProcEvent, cliId model.ClientID) {

RO_Server_Trunk-branch_0.1.39/roserver/gmweb/main.go

@@ -91,7 +91,7 @@ func main() {
 	msg.ResDnyPayInfo = &msg.ResGetPayInfo{
 		GiftList: make([]msg.GiftLists, 0),
 	}
-	for _, v := range serverproto.RuneShopGiftsCfgLoader {
+	for _, v := range serverproto.RuneShopGiftsCfgLoader2 {
 		r, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", v.RMB), 64)
 		a := &msg.ExtrasDn{
 			GoodsId:   v.Id,

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

@@ -437,7 +437,7 @@ func WebPayHwDn2Notify(c *gin.Context) {
 			c.JSON(http.StatusOK, gin.H{"status": 1, "msg": "sign error"})
 			return
 		}
-	} else if extras.Platform == "XUAN_YOU_Google_Ios" {
+	} else if extras.Platform == "XUAN_YOU_IOS" {
 		if sign != getMd5DnSign("3f8e9fec0794443f76d3a27cd41e2711", username, orderId, server, payAmount, extra, sandbox, timestamp) {
 			c.JSON(http.StatusOK, gin.H{"status": 1, "msg": "sign error"})
 			return

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

@@ -3060,6 +3060,7 @@ func RuneShopExploreRewardCfgLoad(path string) {
 }
 
 var RuneShopGiftsCfgLoader map[int32]*RuneShopGiftsCfg
+var RuneShopGiftsCfgLoader2 []*RuneShopGiftsCfg
 
 type RuneShopGiftsCfg struct {
 	Id             int32    `csv:"Id"`             //禮包Id
@@ -3087,11 +3088,11 @@ func RuneShopGiftsCfgLoad(path string) {
 // 东南亚网页使用直充档位
 func RuneShopGiftsCfgLoad2(path string) {
 	cfg := []*RuneShopGiftsCfg{}
-	RuneShopGiftsCfgLoader = map[int32]*RuneShopGiftsCfg{}
+	//RuneShopGiftsCfgLoader = []*RuneShopGiftsCfg{}
 	loadCsvCfg(path+"RuneShopGiftsCfg.csv", &cfg)
 	for _, row := range cfg {
-		if row.SDKGoodsId != "" {
-			RuneShopGiftsCfgLoader[row.Id] = row
+		if row.SDKGoodsId != "" && row.Id > 300 {
+			RuneShopGiftsCfgLoader2 = append(RuneShopGiftsCfgLoader2, row)
 		}
 	}
 }