1
This commit is contained in:
parent
1aa4d3ac1c
commit
12b03945a8
108
server/.idea/workspace.xml
generated
108
server/.idea/workspace.xml
generated
@ -9,20 +9,30 @@
|
||||
<change beforePath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0.tmp" beforeDir="false" afterPath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0.tmp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0000000000000000-0000000000000000.wal" beforeDir="false" afterPath="$PROJECT_DIR$/../doc/etcd-v3.5.17-windows-amd64/default.etcd/member/wal/0000000000000000-0000000000000000.wal" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/config/csv/LiveRoomSellCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/config/csv/LiveRoomSellCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/live_answer_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/live_answer_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/live_card_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/live_card_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/live_game_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/live_game_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/live_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/live_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/live_sell_room.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/live_sell_room.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/room_def.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/room_def.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/room_manager.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/room_manager.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/model/room_player.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/model/room_player.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/fruit/msg/room_msg.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/fruit/msg/room_msg.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/model/role.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/model/role.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/model/role_activity.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/model/role_activity.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/model/role_base.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/model/role_base.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/game/msg/fruit_msg.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/game/msg/fruit_msg.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/config_csv.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/config_csv.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/login.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/login.pb.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/login.proto" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/login.proto" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/user.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/user.pb.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserver/serverproto/user.proto" beforeDir="false" afterPath="$PROJECT_DIR$/roserver/serverproto/user.proto" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/roserverlist/serverlist/serverlist.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/roserverlist/serverlist/serverlist.yaml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/auth" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/auth" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/battleboss" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/battleboss" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/battlerecord" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/battlerecord" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/ExpeditionCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/ExpeditionCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FashionCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FashionCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FightCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FightCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitAwardCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitAwardCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitBetTypeCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitBetTypeCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitSlotTypeCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitSlotTypeCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitSpecialAwardCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/FruitSpecialAwardCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/ItemCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/ItemCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/JobCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/JobCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/LevelCfg.csv" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/config/csv/LevelCfg.csv" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/db" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/db" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/fruit" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/fruit" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../server_publish/run/linux/game" beforeDir="false" afterPath="$PROJECT_DIR$/../server_publish/run/linux/game" afterDir="false" />
|
||||
@ -68,44 +78,44 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"DefaultGoTemplateProperty": "Go File",
|
||||
"Go Build.auth.executor": "Run",
|
||||
"Go Build.battleboss.executor": "Run",
|
||||
"Go Build.battlerecord.executor": "Run",
|
||||
"Go Build.db.executor": "Run",
|
||||
"Go Build.fruit.executor": "Run",
|
||||
"Go Build.game.executor": "Debug",
|
||||
"Go Build.game1.executor": "Run",
|
||||
"Go Build.game2.executor": "Debug",
|
||||
"Go Build.gate.executor": "Debug",
|
||||
"Go Build.gate1.executor": "Run",
|
||||
"Go Build.gate2.executor": "Debug",
|
||||
"Go Build.gmweb.executor": "Run",
|
||||
"Go Build.guild.executor": "Run",
|
||||
"Go Build.rank.executor": "Run",
|
||||
"Go Build.serverlist.executor": "Run",
|
||||
"Go Build.social.executor": "Run",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.go.formatter.settings.were.checked": "true",
|
||||
"RunOnceActivity.go.migrated.go.modules.settings": "true",
|
||||
"RunOnceActivity.go.modules.automatic.dependencies.download": "true",
|
||||
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"go.import.settings.migrated": "true",
|
||||
"go.sdk.automatically.set": "true",
|
||||
"last_opened_file_path": "C:/Users/letme/Desktop/Work/LeGang/ro-webgl-server/server/roserver/fruit",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"run.configurations.included.in.services": "true",
|
||||
"service.view.auto.scroll.from.source": "true",
|
||||
"settings.editor.selected.configurable": "Errors"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"DefaultGoTemplateProperty": "Go File",
|
||||
"Go Build.auth.executor": "Run",
|
||||
"Go Build.battleboss.executor": "Run",
|
||||
"Go Build.battlerecord.executor": "Run",
|
||||
"Go Build.db.executor": "Run",
|
||||
"Go Build.fruit.executor": "Run",
|
||||
"Go Build.game.executor": "Debug",
|
||||
"Go Build.game1.executor": "Debug",
|
||||
"Go Build.game2.executor": "Debug",
|
||||
"Go Build.gate.executor": "Debug",
|
||||
"Go Build.gate1.executor": "Run",
|
||||
"Go Build.gate2.executor": "Debug",
|
||||
"Go Build.gmweb.executor": "Run",
|
||||
"Go Build.guild.executor": "Run",
|
||||
"Go Build.rank.executor": "Run",
|
||||
"Go Build.serverlist.executor": "Run",
|
||||
"Go Build.social.executor": "Run",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.go.formatter.settings.were.checked": "true",
|
||||
"RunOnceActivity.go.migrated.go.modules.settings": "true",
|
||||
"RunOnceActivity.go.modules.automatic.dependencies.download": "true",
|
||||
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"go.import.settings.migrated": "true",
|
||||
"go.sdk.automatically.set": "true",
|
||||
"last_opened_file_path": "C:/Users/letme/Desktop/Work/LeGang/ro-webgl-server/server/roserver/fruit",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"run.configurations.included.in.services": "true",
|
||||
"service.view.auto.scroll.from.source": "true",
|
||||
"settings.editor.selected.configurable": "Errors"
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
<command value="msg *serverproto.S" />
|
||||
@ -394,17 +404,17 @@
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="DlvLineBreakpoint">
|
||||
<url>file://$PROJECT_DIR$/roserver/game/model/role_activity.go</url>
|
||||
<line>1451</line>
|
||||
<line>1462</line>
|
||||
<option name="timeStamp" value="362" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="DlvLineBreakpoint">
|
||||
<url>file://$PROJECT_DIR$/roserver/game/model/role_activity.go</url>
|
||||
<line>4266</line>
|
||||
<line>4277</line>
|
||||
<option name="timeStamp" value="398" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="DlvLineBreakpoint">
|
||||
<url>file://$PROJECT_DIR$/roserver/game/model/role_activity.go</url>
|
||||
<line>4539</line>
|
||||
<line>4550</line>
|
||||
<option name="timeStamp" value="404" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="DlvLineBreakpoint">
|
||||
|
||||
13
server/roserver/config/csv/RechargeGiftCfg.csv
Normal file
13
server/roserver/config/csv/RechargeGiftCfg.csv
Normal file
@ -0,0 +1,13 @@
|
||||
唯一id,"平台：0-PC，1-GooglePlay, 2-AppStore",标题,描述,货币类型 ,价格,商品ID,获得物品,解锁条件(1-关卡，2-玩家等级)
|
||||
Id,Platform,Title,Desp,CurrencyType,Price,goodsId,Items,Condition
|
||||
int,int,string,string,string,string,string,list,list
|
||||
1,0,充值礼包1,这是充值礼包1,¥,1,rechargeGift1,696:1,1:20001
|
||||
2,0,充值礼包2,这是充值礼包2,¥,2,rechargeGift2,696:2,1:30001
|
||||
3,0,充值礼包3,这是充值礼包3,¥,3,rechargeGift3,696:3,1:40001
|
||||
4,0,充值礼包4,这是充值礼包4,¥,4,rechargeGift4,696:4,1:50001
|
||||
5,0,充值礼包5,这是充值礼包5,¥,5,rechargeGift5,696:5,1:60001
|
||||
6,0,充值礼包6,这是充值礼包6,¥,6,rechargeGift6,696:6,1:70001
|
||||
7,0,充值礼包7,这是充值礼包7,¥,7,rechargeGift7,696:7,1:80001
|
||||
8,0,充值礼包8,这是充值礼包8,¥,8,rechargeGift8,696:8,1:90001
|
||||
9,0,充值礼包9,这是充值礼包9,¥,9,rechargeGift9,696:9,1:100001
|
||||
10,0,充值礼包10,这是充值礼包10,¥,10,rechargeGift10,696:10,1:110001
|
||||
|
@ -701,6 +701,7 @@ func (self *LiveRoom) SendChat(senderId uint64, chatContent string) {
|
||||
PlayerInfo: &serverproto.LiveRoomPlayerInfo{
|
||||
Nickname: senderPlayer.Name,
|
||||
Level: senderPlayer.Level,
|
||||
VipLevel: senderPlayer.VipLevel,
|
||||
HeadId: senderPlayer.HeadId,
|
||||
HeadTitle: 1,
|
||||
},
|
||||
|
||||
@ -6,6 +6,7 @@ type RoomPlayer struct {
|
||||
Uid uint64
|
||||
Name string
|
||||
Level uint32
|
||||
VipLevel uint32
|
||||
HeadId string
|
||||
HeadTitle uint32
|
||||
|
||||
|
||||
@ -158,6 +158,7 @@ func init() {
|
||||
player.Name = msg.PlayerInfo.Nickname
|
||||
player.HeadId = msg.PlayerInfo.HeadId
|
||||
player.Level = msg.PlayerInfo.Level
|
||||
player.VipLevel = msg.PlayerInfo.VipLevel
|
||||
player.CoinNum = msg.CoinNum
|
||||
player.GameChipNum = msg.GameChipNum
|
||||
oldRoom, _ := model2.RoomMgr.GetLiveRoomByUid(msg.Uid)
|
||||
|
||||
@ -1600,6 +1600,9 @@ func (this *Role) AddJobExp(st AddItemST) bool {
|
||||
func (this *Role) GetRoleLevel() int32 {
|
||||
return this.GetRoleBase().GetRoleLevel()
|
||||
}
|
||||
func (this *Role) GetVipLevel() int32 {
|
||||
return this.GetRoleBase().GetVipLevel()
|
||||
}
|
||||
func (this *Role) GetJobLevel() int32 {
|
||||
return this.GetRoleBase().GetRoleJobLevel()
|
||||
}
|
||||
|
||||
@ -254,7 +254,18 @@ func (this *RoleActivity) Load(msg interface{}) bool {
|
||||
//充值
|
||||
this.firstChargeTime = proRole.RoleActivity.FirstChargeTime
|
||||
this.firstChargeRewardStat = proRole.RoleActivity.FirstChargeRewardState
|
||||
this.superUnlockChargeList = proRole.RoleActivity.UnlockChargeList
|
||||
|
||||
//this.superUnlockChargeList = proRole.RoleActivity.UnlockChargeList
|
||||
this.superUnlockChargeList = make([]*serverproto.ActivitiesUnlockRechargeData, 0)
|
||||
for _, cfgData := range serverproto.ActivitiesDiscountsCfgLoader {
|
||||
unlockData := &serverproto.ActivitiesUnlockRechargeData{
|
||||
ActivitiesId: cfgData.Id,
|
||||
StartTime: 0,
|
||||
EndTime: math.MaxUint64 - 10000,
|
||||
}
|
||||
this.superUnlockChargeList = append(this.superUnlockChargeList, unlockData)
|
||||
}
|
||||
|
||||
this.hasDelActivityList = proRole.RoleActivity.ExpiredActivityList
|
||||
this.addLoginDay = proRole.RoleActivity.AddLoginDay
|
||||
for idx := 0; idx < len(proRole.RoleActivity.UnlockChargeHasList); idx++ {
|
||||
@ -3027,7 +3038,7 @@ func (this *RoleActivity) SuperChargeUnlockCheck(unlockType serverproto.UnlockCh
|
||||
unlockData.Code = model.ConvertPayCode(activity.Payid)
|
||||
unlockData.OriginalPrice = model.ConvertPayAmount(activity.Payid)
|
||||
}
|
||||
this.superUnlockChargeList = append(this.superUnlockChargeList, unlockData)
|
||||
//this.superUnlockChargeList = append(this.superUnlockChargeList, unlockData)
|
||||
bAdd = true
|
||||
if tmpVal == nil {
|
||||
tmpVal = &serverproto.KeyValueType{Key: cfgData.ProductId, Value: 1}
|
||||
@ -3113,7 +3124,7 @@ func (this *RoleActivity) SuperChargeUnlockCheck(unlockType serverproto.UnlockCh
|
||||
unlockData.Code = model.ConvertPayCode(activity.Payid)
|
||||
unlockData.OriginalPrice = model.ConvertPayAmount(activity.Payid)
|
||||
}
|
||||
this.superUnlockChargeList = append(this.superUnlockChargeList, unlockData)
|
||||
//this.superUnlockChargeList = append(this.superUnlockChargeList, unlockData)
|
||||
bAdd = true
|
||||
if tmpVal == nil {
|
||||
tmpVal = &serverproto.KeyValueType{Key: cfgData.ProductId, Value: 1}
|
||||
|
||||
@ -162,6 +162,9 @@ func (this *RoleBase) GetRoleJobExp() int32 {
|
||||
func (this *RoleBase) GetRoleLevel() int32 {
|
||||
return this.RoleData().HeroData.BaseLevel
|
||||
}
|
||||
func (this *RoleBase) GetVipLevel() int32 {
|
||||
return this.roleBase.VipLevel
|
||||
}
|
||||
func (this *RoleBase) GetRoleJobLevel() int32 {
|
||||
return this.RoleData().JobLevel
|
||||
}
|
||||
|
||||
@ -225,6 +225,7 @@ func init() {
|
||||
msg.PlayerInfo = &serverproto.LiveRoomPlayerInfo{
|
||||
HeadId: strconv.Itoa(int(headId)),
|
||||
Level: uint32(role.(*model2.Role).GetRoleLevel()),
|
||||
VipLevel: uint32(role.(*model2.Role).GetVipLevel()),
|
||||
Nickname: role.(*model2.Role).GetNickName(),
|
||||
HeadTitle: 1,
|
||||
Data: "",
|
||||
|
||||
@ -111,6 +111,7 @@ const (
|
||||
CFG_PresspointPvPCfg = "PresspointPvPCfg.csv"
|
||||
CFG_QualityPointCfg = "QualityPointCfg.csv"
|
||||
CFG_QuickBattleCostCfg = "QuickBattleCostCfg.csv"
|
||||
CFG_RechargeGiftCfg = "RechargeGiftCfg.csv"
|
||||
CFG_RobotCfg = "RobotCfg.csv"
|
||||
CFG_RoleAttributeCfg = "RoleAttributeCfg.csv"
|
||||
CFG_RuneShopExploreCfg = "RuneShopExploreCfg.csv"
|
||||
@ -268,6 +269,7 @@ func configNameListInit(){
|
||||
CFGNameList["PresspointPvPCfg"] = PresspointPvPCfgLoad
|
||||
CFGNameList["QualityPointCfg"] = QualityPointCfgLoad
|
||||
CFGNameList["QuickBattleCostCfg"] = QuickBattleCostCfgLoad
|
||||
CFGNameList["RechargeGiftCfg"] = RechargeGiftCfgLoad
|
||||
CFGNameList["RobotCfg"] = RobotCfgLoad
|
||||
CFGNameList["RoleAttributeCfg"] = RoleAttributeCfgLoad
|
||||
CFGNameList["RuneShopExploreCfg"] = RuneShopExploreCfgLoad
|
||||
@ -458,6 +460,7 @@ func ConfigInit(path string) {
|
||||
PresspointPvPCfgLoad(path)
|
||||
QualityPointCfgLoad(path)
|
||||
QuickBattleCostCfgLoad(path)
|
||||
RechargeGiftCfgLoad(path)
|
||||
RobotCfgLoad(path)
|
||||
RoleAttributeCfgLoad(path)
|
||||
RuneShopExploreCfgLoad(path)
|
||||
@ -2853,6 +2856,27 @@ func QuickBattleCostCfgLoad(path string) {
|
||||
}
|
||||
}
|
||||
|
||||
var RechargeGiftCfgLoader map[int32]*RechargeGiftCfg
|
||||
type RechargeGiftCfg struct{
|
||||
Id int32 `csv:"Id"` //唯一id
|
||||
Platform int32 `csv:"Platform"` //平台：0-PC，1-GooglePlay, 2-AppStore
|
||||
Title string `csv:"Title"` //标题
|
||||
Desp string `csv:"Desp"` //描述
|
||||
CurrencyType string `csv:"CurrencyType"` //货币类型
|
||||
Price string `csv:"Price"` //价格
|
||||
ProductId string `csv:"ProductId"` //商品ID
|
||||
Items []string `csv:"Items"` //获得物品
|
||||
Condition []string `csv:"Condition"` //解锁条件(1-关卡，2-玩家等级)
|
||||
}
|
||||
func RechargeGiftCfgLoad(path string) {
|
||||
cfg := []*RechargeGiftCfg{}
|
||||
RechargeGiftCfgLoader = map[int32]*RechargeGiftCfg{}
|
||||
loadCsvCfg(path + "RechargeGiftCfg.csv", &cfg)
|
||||
for _,row := range cfg{
|
||||
RechargeGiftCfgLoader[row.Id] = row
|
||||
}
|
||||
}
|
||||
|
||||
var RobotCfgLoader map[int32]*RobotCfg
|
||||
type RobotCfg struct{
|
||||
RobotId int32 `csv:"RobotId"` //机器人ID
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2051,9 +2051,10 @@ message LiveRoomPlayerInfo {
|
||||
uint64 uid = 1;
|
||||
string nickname = 2;
|
||||
uint32 level = 3;
|
||||
string head_id = 4;
|
||||
uint32 head_title = 5;
|
||||
string data = 6;
|
||||
uint32 vip_level = 4;
|
||||
string head_id = 5;
|
||||
uint32 head_title = 6;
|
||||
string data = 7;
|
||||
}
|
||||
|
||||
message LiveRoomChatData {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
serverlist:
|
||||
eng: [{serverid: 1, servername: LUNA内网欧美测试服, ip: 127.0.0.1, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc-4, state: 0, invisible: 0}]
|
||||
asia: [{serverid: 1, servername: LUNA亚服线上测试服, ip: 127.0.0.1, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc+8, state: 0, invisible: 0}]
|
||||
ind: [{serverid: 1, servername: LUNA亚服线上测试服, ip: 127.0.0.1, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc+8, state: 0, invisible: 0}]
|
||||
eng: [{serverid: 1, servername: LUNA内网欧美测试服, ip: 192.168.31.100, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc-4, state: 0, invisible: 0}]
|
||||
asia: [{serverid: 1, servername: LUNA亚服线上测试服, ip: 192.168.31.100, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc+8, state: 0, invisible: 0}]
|
||||
ind: [{serverid: 1, servername: LUNA亚服线上测试服, ip: 192.168.31.100, port: [6411], type: 0, stime: "2024-10-14 12:00:00", timezone : utc+8, state: 0, invisible: 0}]
|
||||
|
||||
whitelist:
|
||||
ip:
|
||||
@ -20,14 +20,14 @@ update_info:
|
||||
platform_url: [ { platform: android, url: "https://play.google.com/store/apps/details?id=com.mujoysg.luna"},
|
||||
{ platform: ios,url: "https://apps.apple.com/app/id6451477771"} ]
|
||||
|
||||
update_info_list: [ { cdn: "http://127.0.0.1:8000", whitelist: 1, version: 1.4.0 },
|
||||
{ cdn: "http://127.0.0.1:8000", whitelist: 0, version: 1.3.5 },
|
||||
{ cdn: "http://127.0.0.1:8000", whitelist: 0, version: 1.3.0 },
|
||||
{ cdn: "http://127.0.0.1:8000", whitelist: 0, version: 1.3.1 } ]
|
||||
update_info_list: [ { cdn: "http://192.168.31.100:8000", whitelist: 1, version: 1.4.0 },
|
||||
{ cdn: "http://192.168.31.100:8000", whitelist: 0, version: 1.3.5 },
|
||||
{ cdn: "http://192.168.31.100:8000", whitelist: 0, version: 1.3.0 },
|
||||
{ cdn: "http://192.168.31.100:8000", whitelist: 0, version: 1.3.1 } ]
|
||||
|
||||
cdn_list: [ { cdn: "http://127.0.0.1:8000", whitelist: 0, platform: android },
|
||||
{ cdn: "http://127.0.0.1:8000", whitelist: 0, platform: ios },
|
||||
{ cdn: "http://127.0.0.1:8000", whitelist: 0, platform: all } ]
|
||||
cdn_list: [ { cdn: "http://192.168.31.100:8000", whitelist: 0, platform: android },
|
||||
{ cdn: "http://192.168.31.100:8000", whitelist: 0, platform: ios },
|
||||
{ cdn: "http://192.168.31.100:8000", whitelist: 0, platform: all } ]
|
||||
|
||||
notice_info: [ {region: "eng",url: "https://testnotice-luna-wt.wtgames.cn/v3/notice"},
|
||||
{region: "asia",url: "https://luna-asia-notice.wtgames.cn:8001/v3/notice"}]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user