Merge branch 'develop' into release

道具变化类型修改
2024-06-05 15:25:03 +08:00 · 2024-06-05 15:22:05 +08:00
1 changed files with 2 additions and 2 deletions
--- a/common/constant.go
+++ b/common/constant.go
@ -250,7 +250,7 @@ const (
 	GainWay_RankReward                  = 61 //排位奖励
 	GainWay_TaskReward                  = 62 //任务奖励
 	GainWay_Interact                    = 63 //房间内互动效果
-	GainWay_Collect                     = 64 //集卡活动
+	GainWayItemCollectExchange          = 64 //集卡活动兑换
 	GainWay_WeekCardAward               = 65 //周卡奖励
 	GainWay_PigrankTakeCoin             = 66 //存钱罐领取耗费钻石
 	GainWay_PigrankGainCoin             = 67 //存钱罐打开获取金币
@ -259,7 +259,7 @@ const (
 	GainWay_PetUpgrade                  = 70 //宠物升级
 	GainWay_Game                        = 71 //游戏掉落
 	GainWayItemCollectLogin             = 73 //集卡活动登录
-	GainWayItemCollectExchange          = 74 //集卡活动兑换
+	GainWay_Collect                     = 74 //集卡活动
 	GainWayItemPhoneScoreExchange       = 75 //抽手机活动兑换
 	GainWayItemTaskInvite               = 78 //邀请任务
 	GainWayItemTaskNewPlayer            = 79 //新手任务
Author	SHA1	Message	Date
sk	8eea14794d	Merge branch 'develop' into release	2024-06-05 15:25:03 +08:00
sk	14ee52a532	道具变化类型修改	2024-06-05 15:22:05 +08:00