huangyuhao80 дней назад: 3
Родитель
Сommit
189dff7fbe
2 измененных файлов с 9 добавлено и 42 удалено
  1. 6 41
      meta/userapi/lua/ActMonthlyGrow.lua
  2. 3 1
      meta/userapi/lua/LuaMessageIdConst.lua

+ 6 - 41
meta/userapi/lua/ActMonthlyGrow.lua

@@ -40,8 +40,8 @@ function ActMonthlyGrow.dailyLoginAward(actor)
40 40
 
41 41
     sendluamsg(
42 42
         actor,
43
-        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
44
-        {payTime = data.payTime, rewardStatus = data.rewardStatus}
43
+        LuaMessageIdToClient.RES_ACT_MONTHLY_GROW_INFO,
44
+        {payTime = data.payTime, lstTimeAward = data.lstTimeAward, endTime = data.endTime}
45 45
     )
46 46
 end
47 47
 
@@ -179,8 +179,8 @@ function ActMonthlyGrow.rechargeEvent(actor, cfg_recharge, count, amount, ext, o
179 179
 
180 180
     sendluamsg(
181 181
         actor,
182
-        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
183
-        {payTime = data.payTime, rewardStatus = data.rewardStatus}
182
+        LuaMessageIdToClient.RES_ACT_MONTHLY_GROW_INFO,
183
+        {payTime = data.payTime, lstTimeAward = data.lstTimeAward, endTime = data.endTime}
184 184
     )
185 185
 end
186 186
 
@@ -189,44 +189,9 @@ function ActMonthlyGrow.reqAction(actor, type, action, reqParameter)
189 189
     if action == "panel" then
190 190
         local data = ActMonthlyGrow.getData(actor)
191 191
         ActMonthlyGrow.sendPanel(actor, data)
192
-    elseif action == "reward" then
193
-        ActMonthlyGrow.gainReward(actor, reqParameter)
194 192
     end
195 193
 end
196 194
 
197
-function ActMonthlyGrow.gainReward(actor, reqParameter)
198
-    local data = ActMonthlyGrow.getData(actor)
199
-    -- 未充值
200
-    if data.payTime == 0 then
201
-        tipinfo(actor, "未充值")
202
-        return
203
-    end
204
-    -- 已领取
205
-    if data.rewardStatus > 0 then
206
-        tipinfo(actor, "已领取")
207
-        return
208
-    end
209
-    -- 发放奖励
210
-    local reward = ConfigDataManager.getTableValue("cfg_Activity_firstRecharge", "reward", "id", 1)
211
-    local tmp = string.toIntIntMap(reward, "#", "|")
212
-    if table.notNullOrEmpty(tmp) then
213
-        --奖励进入背包
214
-        Bag.sendRewards(actor, tmp, "充值奖励")
215
-    end
216
-
217
-    -- 改变状态
218
-    data.rewardStatus = 2
219
-    ActMonthlyGrow.saveData(data, actor)
220
-    -- 发送奖励
221
-    ActMonthlyGrow.sendPanel(actor, data)
222
-    -- jprint("领奖豪礼数据",data)
223
-    sendluamsg(
224
-        actor,
225
-        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
226
-        {payTime = data.payTime, rewardStatus = data.rewardStatus}
227
-    )
228
-end
229
-
230 195
 function ActMonthlyGrow.sendPanel(actor, data)
231 196
     Recharge.resAction(actor, _rechargeType(), "panel", data)
232 197
 end
@@ -236,8 +201,8 @@ function ActMonthlyGrow.getInfo(actor, msgData)
236 201
     local data = ActMonthlyGrow.getData(actor)
237 202
     sendluamsg(
238 203
         actor,
239
-        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
240
-        {payTime = data.payTime, rewardStatus = data.rewardStatus}
204
+        LuaMessageIdToClient.RES_ACT_MONTHLY_GROW_INFO,
205
+        {payTime = data.payTime, lstTimeAward = data.lstTimeAward, endTime = data.endTime}
241 206
     )
242 207
 end
243 208
 

+ 3 - 1
meta/userapi/lua/LuaMessageIdConst.lua

@@ -326,7 +326,9 @@ LuaMessageIdToClient = {
326 326
     RES_WORLD_AUCTION_BUY_RESULT = 10000317, -- 响应竞拍购买结果
327 327
     -- 活动
328 328
     -- 首充活动
329
-    RES_ACT_FIRST_CHARGE_INFO = 10000400 -- 响应首充活动信息
329
+    RES_ACT_FIRST_CHARGE_INFO = 10000400, -- 响应首充活动信息
330
+    -- 月卡活动
331
+    RES_ACT_MONTHLY_GROW_INFO = 10000401 -- 响应月卡活动信息
330 332
 }
331 333
 -- 服务器接收的消息id
332 334
 LuaMessageIdToSever = {