Compare commits
No commits in common. "c67fc81182aea2b6735898e6cecb72a4eec61e73" and "6cdc64f5e62991af46dc376737c9a528be225dfa" have entirely different histories.
c67fc81182
...
6cdc64f5e6
|
@ -17,7 +17,8 @@ default:
|
||||||
cache:
|
cache:
|
||||||
key: "$CI_COMMIT_REF_NAME-$(md5sum go.mod go.sum)"
|
key: "$CI_COMMIT_REF_NAME-$(md5sum go.mod go.sum)"
|
||||||
paths:
|
paths:
|
||||||
- ~/.cache/go-build/
|
- .cache/go-build/
|
||||||
|
- $GOPATH/pkg/mod/
|
||||||
policy: pull-push
|
policy: pull-push
|
||||||
|
|
||||||
# 锁定作业,防止并发流水线执行
|
# 锁定作业,防止并发流水线执行
|
||||||
|
@ -46,7 +47,7 @@ build-job:
|
||||||
fi
|
fi
|
||||||
# 拷贝到GOPATH
|
# 拷贝到GOPATH
|
||||||
- echo '拷贝到GOPATH'
|
- echo '拷贝到GOPATH'
|
||||||
- rsync -rvc --no-perms --delete ./* $GOPATH/src/$ProjectPath
|
- rsync -rv --no-perms --delete ./* $GOPATH/src/$ProjectPath
|
||||||
# 进入项目目录
|
# 进入项目目录
|
||||||
- cd $GOPATH/src/$ProjectPath
|
- cd $GOPATH/src/$ProjectPath
|
||||||
# 编译
|
# 编译
|
||||||
|
@ -60,7 +61,7 @@ build-job:
|
||||||
do
|
do
|
||||||
cd $line
|
cd $line
|
||||||
echo "编译 $line"
|
echo "编译 $line"
|
||||||
go build -v
|
go build
|
||||||
cd ..
|
cd ..
|
||||||
done < shell/programs.txt
|
done < shell/programs.txt
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,6 @@ const (
|
||||||
ActivityLog_PigBank // 购买存钱罐
|
ActivityLog_PigBank // 购买存钱罐
|
||||||
ActivityLog_Shop //商城购买
|
ActivityLog_Shop //商城购买
|
||||||
ActivityLog_Exchange //商城兑换
|
ActivityLog_Exchange //商城兑换
|
||||||
ActivityLog_CoinPigBank //金币存钱罐
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type PlayerGameCtrlData struct {
|
type PlayerGameCtrlData struct {
|
||||||
|
|
|
@ -1856,7 +1856,7 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
|
||||||
pack.Price = int64(infoData.CoinPrice)
|
pack.Price = int64(infoData.CoinPrice)
|
||||||
logger.Logger.Tracef("PigbankTakeCoin snid: %v pack: %v", p.SnId, pack)
|
logger.Logger.Tracef("PigbankTakeCoin snid: %v pack: %v", p.SnId, pack)
|
||||||
p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
|
p.SendToClient(int(welfare.SPacketID_PACKET_SCPigbankTakeCoin), pack)
|
||||||
mq.Write(model.GenerateActivityLog(p.SnId, p.Platform, model.ActivityLog_CoinPigBank, 1))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue