Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

hwj35

2025-12-10 8c4ebdf94eba34262522c32363f4a77e86e1ce92

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

 Audio/UI1/Btn_Warhammer.MP3

Binary files differ

 Config/FuncConfig.txt

@@ -12,7 +12,7 @@
PersonalMail    200                

BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999}    {}        

OSABillboard    {"3":[1, 2], "4":[2, 3]}    {"1":[[1,300,0],[12,80,0]],"2":[[1,200,0],[12,60,0]],"3":[[1,100,0],[12,40,0]],"5":[[1,80,0],[12,20,0]],"10":[[1,60,0],[12,16,0]],"50":[[1,40,0],[12,12,0]],"500":[[1,30,0],[12,10,0]],"9999":[[1,20,0],[12,10,0]]}    {"1":[[1,2000,0],[13,50,0]],"2":[[1,1600,0],[13,40,0]],"3":[[1,1200,0],[13,30,0]],"5":[[1,1000,0],[13,25,0]],"10":[[1,800,0],[13,20,0]],"50":[[1,600,0],[13,15,0]],"500":[[1,400,0],[13,10,0]],"9999":[[1,200,0],[13,5,0]]}        

OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}			
OSACelebration    7    {"2000":[[3,100]],"3000":[[2,20000]],"5000":[[7,10000]],"8000":[[8,100]],"10000":[[5,10]]}    20		
TalkCD    {"0":3,"3":3}                

TalkColor    42|227|55|255    245|246|230|255    {"0":[254,247,234,255], "3":[42,227,55,255], "6":[245,180,234,255]}    245|246|230|255    

TalkLimit    50                


 Config/Mail.txt

@@ -18,3 +18,4 @@
ZhanlingRewardUnget    每周奖励补发    主公上周的每周奖励未领取，为防遗失特此补发。

OSAMainLevel    开服关卡榜奖励    恭喜主公在开服关卡榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！

OSAHeroCall    开服招募榜奖励    恭喜主公在开服招募榜中荣登第<color=#248B12>{0}</color>名，为主公准备的奖励已存放在附件中，请注意及时查收！

OSACelebrationPoint    庆典积分转换补偿    您在开服庆典活动中未使用的庆典积分已转换为元宝发放，请注意查收。