fix 推币机震动

data/DB_PigBank_Diamond.dat

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


 (€­β8–
@΅θ;PdX–
`c
 < ((€­β2ΕΈ
2συ
8¬@Άθ;JΖΈ
Jσυ
PdX¬`Η

-?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;Jσυ
JΖΈPdXξ`σ
+?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;JΖΈJσυ
PdXξ`σ

data/DB_PropExchange.json

@@ -117,48 +117,6 @@
 			"Gain": {
 				"100001": 30000
 			}
-		},
+		}
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{},
-		{}
 	]
 }

etcd/keyconf.go

@@ -51,7 +51,7 @@ const (
 	ETCDKEY_LotteryUser         = "/game/user_lottery"       //抽奖用户必中配置
 	ETCDKEY_PigBankDiamond      = "/game/pigbank_diamond"    //存钱罐消耗获得
 	ETCDKEY_PigBankProp         = "/game/pigbank_prop"       //存钱罐属性
-	ETCDKEY_NianConfig          = "/game/activity_nian"      //年兽活动配置
+	ETCDKEY_NianConfig          = "/game/activity_nian/"     //年兽活动配置
 	ETCDKEY_NianRankConfig      = "/game/activity_nian_rank" //年兽排行榜配置
 	KeyRedPacket                = "/game/act_redpacket"      //红包配置
 	KeyActConsume               = "/game/act_consume"        //累计消耗活动配置

worldsrv/action_pushcoin.go

@@ -312,7 +312,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
 		}
 
 	case activity.OpCodes_OP_Shake:
-		item := BagMgrSingleton.GetItem(p.SnId, common.ItemIDShake)
+		item := BagMgrSingleton.GetItem(p.SnId, common.ItemIDPlum)
 		if item == nil || item.ItemNum < msg.GetOpParam() {
 			pack.OpRetCode = activity.OpResultPushCoinCode_OPRC_PushCoin_ShakeNotEnough
 			goto here
@@ -321,7 +321,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
 		BagMgrSingleton.AddItems(&model.AddItemParam{
 			Platform: p.Platform,
 			SnId:     p.SnId,
-			Change:   []*model.Item{{ItemId: common.ItemIDShake, ItemNum: -msg.GetOpParam()}},
+			Change:   []*model.Item{{ItemId: common.ItemIDPlum, ItemNum: -msg.GetOpParam()}},
 			GainWay:  common.GainWayPushCoinExchangeCost,
 			Operator: "system",
 			Remark:   "推币机兑换消耗",