陆恒 / HappyCat

Download as
Browse Code »

Commit 444981796ede14c116c3c669589bb90b438b9624

Authored by 陆恒
1 parent 1ded14db
Exists in master

提交

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
src/HttpServer/logic/function.go
  Diff comments   View file @4449817
... ... @@ -796,6 +796,7 @@ func DoAutoMergeRedCat(uinfo *UserData, uuid int) {
796 796  
797 797 //合成红包猫 返回红包猫等级 等级为red_catconfig的id+100
798 798 func MergeRedBagCat(uinfo *UserData, pos int) float32 {
  799 +
799 800 rtpos := float32(0)
800 801  
801 802 //走随机合成逻辑
... ...
src/HttpServer/logic/logic.go
  Diff comments   View file @4449817
... ... @@ -2271,6 +2271,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
2271 2271 //加钱
2272 2272 uinfo.AddRedPackect(idx, 100)
2273 2273 }
  2274 + resp.Data.NewCat = 37
2274 2275  
2275 2276 } else {
2276 2277 //
... ... @@ -2288,7 +2289,7 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
2288 2289 }
2289 2290 } else {
2290 2291 //不相同 交换即可
2291   - if (uinfo.PosInfo[rdata.From].Cat == 108 && uinfo.PosInfo[rdata.To].Cat == 109) || (uinfo.PosInfo[rdata.From].Cat == 109 && uinfo.PosInfo[rdata.To].Cat == 108) {
  2292 + if (uinfo.PosInfo[rdata.From].Cat == 45 && uinfo.PosInfo[rdata.To].Cat == 46) || (uinfo.PosInfo[rdata.From].Cat == 46 && uinfo.PosInfo[rdata.To].Cat == 45) {
2292 2293 //合成情侣猫
2293 2294 addredpacket := uinfo.PosInfo[rdata.From].RedPacket + uinfo.PosInfo[rdata.To].RedPacket
2294 2295 uinfo.PosInfo[rdata.From].Cat = 0
... ... @@ -2300,6 +2301,11 @@ func HandlerExchangePos(w http.ResponseWriter, data string, uuid int) {
2300 2301 //todo 调用sdk接口
2301 2302 } else {
2302 2303 uinfo.PosInfo[rdata.From].Cat, uinfo.PosInfo[rdata.To].Cat = uinfo.PosInfo[rdata.To].Cat, uinfo.PosInfo[rdata.From].Cat
  2304 + uinfo.PosInfo[rdata.From].Time, uinfo.PosInfo[rdata.To].Time = uinfo.PosInfo[rdata.To].Time, uinfo.PosInfo[rdata.From].Time
  2305 + uinfo.PosInfo[rdata.From].Position, uinfo.PosInfo[rdata.To].Position = uinfo.PosInfo[rdata.To].Position, uinfo.PosInfo[rdata.From].Position
  2306 + uinfo.PosInfo[rdata.From].RedPacket, uinfo.PosInfo[rdata.To].RedPacket = uinfo.PosInfo[rdata.To].RedPacket, uinfo.PosInfo[rdata.From].RedPacket
  2307 + uinfo.PosInfo[rdata.From].StartTime, uinfo.PosInfo[rdata.To].StartTime = uinfo.PosInfo[rdata.To].StartTime, uinfo.PosInfo[rdata.From].StartTime
  2308 +
2303 2309 }
2304 2310 }
2305 2311  
... ...