Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

data/DB_PigBank_Diamond.dat

@@ -1,4 +1,4 @@
 
-


 (Ђ­в0–
8Сэ@dH–
Pc
+


 (Ђ­в0–
8Ўи;@dH–
Pc
- ((Ђ­в0¬8Тэ@dH¬PЗ

+ ((Ђ­в0¬8ўи;@dH¬PЗ

-яБЧ/ 2(Ђ­в0о8Уэ@dHоPу
+яБЧ/ 2(Ђ­в0о8Ји;@dHоPу

data/DB_PigBank_Diamond.json

@@ -7,7 +7,7 @@
 			"CostDiamond": 30,
 			"MaxGold": 10000000,
 			"MaxDiamond": 150,
-			"DiamondId": 98001,
+			"DiamondId": 980001,
 			"CoinPrice": 100,
 			"DiamondPrice": 150,
 			"DiamondNowPrice": 99
@@ -19,7 +19,7 @@
 			"CostDiamond": 40,
 			"MaxGold": 10000000,
 			"MaxDiamond": 300,
-			"DiamondId": 98002,
+			"DiamondId": 980002,
 			"CoinPrice": 100,
 			"DiamondPrice": 300,
 			"DiamondNowPrice": 199
@@ -31,7 +31,7 @@
 			"CostDiamond": 50,
 			"MaxGold": 10000000,
 			"MaxDiamond": 750,
-			"DiamondId": 98003,
+			"DiamondId": 980003,
 			"CoinPrice": 100,
 			"DiamondPrice": 750,
 			"DiamondNowPrice": 499

worldsrv/action_player.go

@@ -2879,7 +2879,7 @@ func CSSMSConfig(s *netlib.Session, packetId int, data interface{}, sid int64) e
 				infoData.SmsName = smsInfo.SmsName
 				ret.Info = append(ret.Info, infoData)
 			}
-			p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCSMSConfig), &ret)
+			p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCSMSConfig), ret)
 		} else {
 			logger.Logger.Errorf("API_SmsConfig err %v", info.Msg)
 		}