hwj35
2026-06-10 4c45e6a650a6660d5a8cf1ed0fc944ee145d5db5
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
9个文件已修改
74 ■■■■■ 已修改文件
Config/FuncConfig.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/HeroSkin.txt 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/Icon.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/Mail.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/Store.txt 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/SysInfo.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/Zhanling.txt 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/GuildAtkDefBatTreasureWin.prefab 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/GuildAtkDefBatWin.prefab 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Config/FuncConfig.txt
@@ -55,7 +55,7 @@
YunShi    {"0":[[1, 2]],"105":[[1, 1],[2, 1]], "106":[[1, 1],[2, 1]], "107":[[1, 1],[2, 1]], "108":[[1, 1],[2, 1]]}    {"105":6, "106":214, "107":8, "108":155}            
TreeLVUP    42    4|300            
TreeEnergy    3    3    120    30    1|50
ParryCfg    0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000)    [1]    0.5    2
ParryCfg    int(min((dParryRate-aParryRateDef)*pow(0.5,tagCnt), 8000))    [1,2]    0.5    2
BuffStateGroup    {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}                
MoneyDisplayModel    {"1":1,"6":15,"15":16,"18":45,"41":3,"42":2,"43":11,"52":14,"53":6,"54":22,"55":23,"56":33,"57":34,"58":35,"97":106,"99":2000}    104        0    0
BattleModelScale    0.75                
@@ -119,10 +119,10 @@
QunyingAward    {"1":[[1012,5,0],[5,15,0]],"2":[[1012,4,0],[5,12,0]],"3":[[1012,3,0],[5,10,0]],"5":[[1012,2,0],[5,8,0]],"10":[[1008,3,0],[5,6,0]],"20":[[1008,2,0],[5,5,0]],"50":[[1008,1,0],[5,4,0]],"100":[[1010,4,0],[5,3,0]],"200":[[1010,3,0],[5,2,0]],"2000":[[1010,2,0],[5,2,0]],"5000":[[1010,1,0],[5,1,0]]}    {"1":[[1013,20,0],[5,50,0]],"2":[[1013,15,0],[5,40,0]],"3":[[1013,10,0],[5,30,0]],"5":[[1013,8,0],[5,25,0]],"10":[[1013,6,0],[5,20,0]],"20":[[1013,5,0],[5,15,0]],"50":[[1009,10,0],[5,13,0]],"100":[[1009,8,0],[5,10,0]],"200":[[1009,6,0],[5,8,0]],"2000":[[1009,5,0],[5,5,0]],"5000":[[1009,4,0],[5,3,0]]}    {"1":[[1,1500],[10,40]],"2":[[1,1200],[10,35]],"3":[[1,1000],[10,30]],"5":[[1,800],[10,25]],"10":[[1,600],[10,20]],"20":[[1,500],[10,18]],"50":[[1,400],[10,15]],"100":[[1,350],[10,12]],"200":[[1,300],[10,10]],"2000":[[1,150],[10,6]],"5000":[[1,100],[10,3]]}    {"1":0,"2":1,"3":2,"5":3,"10":4,"20":5,"50":6,"100":7,"200":8,"2000":9,"5000":10}    
HeroSkinGift    [5000,5001,5002]                
FmAtkDefBatSet    [[1,2,5],[3,6],[4,7]]    5            
FmAtkDefBatPrepare    12    3|50000    4    2
FmAtkDefBatAward    [[16,100],[2,1000]]    [[16,50],[2,500]]    [[16,5000],[2,30000],[5,20],[4,50]]    [[16,3000],[2,15000],[5,10],[4,25]]
FmAtkDefBatTreasure    {"2":9, "3":1}    40    5
FmAtkDefBatShop    1
FmAtkDefBatPrepare    12    7|50000    4    2
FmAtkDefBatAward    [[45,200],[2,1000]]    [[45,80],[2,500]]    [[45,3000],[2,30000],[3,100],[1046,20]]    [[45,3000],[2,15000],[3,50],[1046,10]]
FmAtkDefBatTreasure    {"2":9, "3":1}    40    6
FmAtkDefBatShop    100
FmAtkDefBatRecord    50                
SuperVIP    {"ryzj":100, "test":100}    [[1,50],[5,3],[3,100],[8,100]]            
DJQShow    {"sghy":[99]}                
Config/HeroSkin.txt
@@ -14,13 +14,13 @@
5100110                510011_Wei_Wangyuanji/wei-wangyuanji_SkeletonData    [-20,80,0.85,0]    0|0|0    herohead_wei_wangyuanji    herohead_big_wei_wangyuanji    wei_wangyuanjiOrg    510011_Wei_Wangyuanji/Wei_Wangyuanji_xs_SkeletonData                    
5100111    素纸红妆    countryBG10111        wangyuanjipifu1    [35,445,0.85,0]    0|0|0    herohead_wei_wangyuanji1    herohead_big_wei_wangyuanji1    wei_wangyuanji01    510011_Wei_Wangyuanji_A/wei_wangyuanjipifu_xs_SkeletonData                    1
5100120                510012_Wei_Simayi/wei-simayi_SkeletonData    [10,-20,1,0]    0|0|0    herohead_wei_simayi    herohead_big_wei_simayi        510012_Wei_Simayi/Wei_Simayi_xs_SkeletonData                    
5100121    判官            510012_Wei_Simayi/wei-simayi_SkeletonData    [10,0,1,0]    0|0|0    herohead_wei_simayi    herohead_big_wei_simayi        510012_Wei_Simayi/Wei_Simayi_xs_SkeletonData
5100121    判官            510012_Wei_Simayi/wei-simayi_SkeletonData    [10,0,1,0]    0|0|0    herohead_wei_simayi    herohead_big_wei_simayi        510012_Wei_Simayi/Wei_Simayi_xs_SkeletonData                    9999
5100130                510013_Wei_Zhenfu/wei_zhenji_SkeletonData    [-20,150,1,0]    0|0|0    herohead_wei_zhenfu    herohead_big_wei_zhenfu    wei_zhenfuOrg    510013_Wei_Zhenfu/Wei_Zhenfu_xs_SkeletonData                    
5100131    琴音绯染    countryBG10131        zhenfupifu1    [-40,430,1,0]    0|0|0    herohead_wei_zhenfu1    herohead_big_wei_zhenfu1    wei_zhenfu01    510013_Wei_Zhenfu_A/wei_zhenfu_pifu_xs_SkeletonData                    8
5100140                510014_Wei_Caocao/510014_Wei_Caocao_SkeletonData    [10,30,0.9,0]    0|0|0    herohead_wei_caocao    herohead_big_wei_caocao    wei_caocaoOrg    510014_Wei_Caocao/Wei_Caocao_xs_SkeletonData                    
5100141    幽府冥君    countryBG10141        caocao1    [10,420,0.7,0]    0|0|0    herohead_wei_caocao1    herohead_big_wei_caocao1    wei_caocao01    510014_Wei_Caocao_A/wei_caocaopifu_xs_SkeletonData
5100141    幽府冥君    countryBG10141        caocao1    [10,420,0.7,0]    0|0|0    herohead_wei_caocao1    herohead_big_wei_caocao1    wei_caocao01    510014_Wei_Caocao_A/wei_caocaopifu_xs_SkeletonData                    9999
5100150                510015_Wei_Caoren/wei_caoren_SkeletonData    [-30,40,1.06,0]    0|0|0    herohead_wei_caoren    herohead_big_wei_caoren        510015_Wei_Caoren/Wei_Caoren_xs_SkeletonData                    
5100151    巨石城卫            510015_Wei_Caoren/wei_caoren_SkeletonData    [-30,50,1.1,0]    0|0|0    herohead_wei_caoren    herohead_big_wei_caoren        510015_Wei_Caoren/Wei_Caoren_xs_SkeletonData
5100151    巨石城卫            510015_Wei_Caoren/wei_caoren_SkeletonData    [-30,50,1.1,0]    0|0|0    herohead_wei_caoren    herohead_big_wei_caoren        510015_Wei_Caoren/Wei_Caoren_xs_SkeletonData                    9999
5100160                510016_Wei_Guojia/wei_guojia_SkeletonData    [0,20,1.05,0]    0|0|0    herohead_wei_guojia    herohead_big_wei_guojia    wei_guojiaOrg    510016_Wei_Guojia/wei_guojia_xs_SkeletonData                    
5100161    一念成魔    countryBG10161        510016_Wei_Guojia_A/wei_guojia_pifu_lihui_SkeletonData    [20,20,1,0]    0|0|0    herohead_wei_guojia1    herohead_big_wei_guojia1    wei_guojia01    510016_Wei_Guojia_A/wei_guojiapifu_xs_SkeletonData                    5
5100170                zhangchunhua    [0,550,1.1,0]    0|0|0    herohead_wei_zhangchunhua    herohead_big_wei_zhangchunhua    wei_zhangchunhuaOrg    510017_Wei_Zhangchunhua/wei_zhangchunhua_xs_SkeletonData                    
@@ -43,15 +43,15 @@
5200120                zhugeliang    [-50,400,1,0]    0|0|0    herohead_shu_zhegeliang    herohead_big_shu_zhegeliang        520012_Shu_Zhugeliang/Shu_Zhugeliang_xs_SkeletonData                    
5200121    时隙旅人            zhugeliang    [-50,400,1,0]    0|0|0    herohead_shu_zhegeliang    herohead_big_shu_zhegeliang        520012_Shu_Zhugeliang/Shu_Zhugeliang_xs_SkeletonData                    9999
5200130                liubei    [60,560,1,0]    0|0|0    herohead_shu_liubei    herohead_big_shu_liubei    shu_liubeiOrg    520013_Shu_Liubei/Shu_Liubei_xs_SkeletonData                    
5200131    元婴剑修    countryBG20131        liubei    [60,560,1,0]    0|0|0    herohead_shu_liubei1    herohead_big_shu_liubei1    shu_liubei01    520013_Shu_Liubei/Shu_Liubei_xs_SkeletonData                    9999
5200131    剑仙    countryBG20131        liubei    [60,560,1,0]    0|0|0    herohead_shu_liubei1    herohead_big_shu_liubei1    shu_liubei01    520013_Shu_Liubei_A/shu_liubei_shizhuang_xs_SkeletonData                    9999
5200140                520014_Shu_Guanyu/shu_ganyu_lihui_SkeletonData    [-20,40,1.05,0]    0|0|0    herohead_shu_guanyu    herohead_big_shu_guanyu    shu_guanyuOrg    520014_Shu_Guanyu/Shu_Guanyu_xs_SkeletonData                    
5200141    青龙Ⅱ型    countryBG20141        guanyu1    [50,560,1.05,0]    0|0|0    herohead_shu_guanyu1    herohead_big_shu_guanyu1    shu_guanyu01    520014_Shu_Guanyu_A/shu_guanyu_shizhuang_01_xs_SkeletonData                    1
5200150                zhangfei    [100,450,1.1,0]    0|0|0    herohead_shu_zhangfei    herohead_big_shu_zhangfei        520015_Shu_Zhangfei/Shu_Zhangfei_xs_SkeletonData                    
5200151    八部天龙            zhangfei    [100,440,1.1,0]    0|0|0    herohead_shu_zhangfei    herohead_big_shu_zhangfei        520015_Shu_Zhangfei/Shu_Zhangfei_xs_SkeletonData                    9999
5200160                machao    [25,475,1,0]    0|0|0    herohead_shu_machao    herohead_big_shu_machao    shu_machaoOrg    520016_Shu_Machao/shu_machao_xs_SkeletonData                    
5200161    二郎真君    countryBG20161        machaopifu1    [15,475,1.1,0]    0|0|0    herohead_shu_machao1    herohead_big_shu_machao1    shu_machao01    520016_Shu_Machao_A/shu_machaopf_xs_SkeletonData                    26
5200170                machao    [25,475,1,0]    0|0|0    herohead_shu_machao    herohead_big_shu_machao    shu_machaoOrg    520016_Shu_Machao/shu_machao_xs_SkeletonData
5200171    辉曜骑士    countryBG20161        machaopifu1    [15,475,1.1,0]    0|0|0    herohead_shu_machao1    herohead_big_shu_machao1    shu_machao01    520016_Shu_Machao_A/shu_machaopf_xs_SkeletonData                    89
5200170                mayunlu    [110,490,1,0]    0|0|0    herohead_shu_mayunlu    herohead_big_shu_mayunlu    shu_mayunluOrg    520017_Shu_Mayunlu/shu_mayunlu_xs_SkeletonData
5200171    蔷薇骑士    countryBG20171        mayunlu1    [-10,490,1.1,0]    0|0|0    herohead_shu_mayunlu1    herohead_big_shu_mayunlu1    shu_mayunlu01    520017_Shu_Mayunlu_A/shu_mayunlupifu_xs_SkeletonData                    89
5200180                machao    [25,475,1,0]    0|0|0    herohead_shu_machao    herohead_big_shu_machao    shu_machaoOrg    520016_Shu_Machao/shu_machao_xs_SkeletonData                    
5200181        countryBG20161        machaopifu1    [15,475,1.1,0]    0|0|0    herohead_shu_machao1    herohead_big_shu_machao1    shu_machao01    520016_Shu_Machao_A/shu_machaopf_xs_SkeletonData                    
5200990                machao    [25,475,1,0]    0|0|0    herohead_shu_machao    herohead_big_shu_machao    shu_machaoOrg    520016_Shu_Machao/shu_machao_xs_SkeletonData                    
@@ -69,11 +69,11 @@
5300100                sunshangxiang    [50,400,1,0]    0|0|0    herohead_wu_sunshangxiang    herohead_big_wu_sunshangxiang        530010_Wu_Sunshangxiang/Wu_Sunshangxiang_xs_SkeletonData                    
5300110                daqiao    [-100,430,1,0]    0|0|0    herohead_wu_daqiao    herohead_big_wu_daqiao        530011_Wu_Daqiao/Wu_Daqiao_xs_SkeletonData                    
5300120                zhouyu    [200,600,1,0]    0|0|0    herohead_wu_zhouyu    herohead_big_wu_zhouyu    wu_zhouyuOrg    530012_Wu_Zhouyu/Wu_Zhouyu_xs_SkeletonData                    
5300121    白雾公爵    countryBG30121        zhouyu    [200,600,1,0]    0|0|0    herohead_wu_zhouyu1    herohead_big_wu_zhouyu1    wu_zhouyu01    530012_Wu_Zhouyu/Wu_Zhouyu_xs_SkeletonData                    9999
5300121    白雾公爵    countryBG30121        zhouyu1    [200,600,1,0]    0|0|0    herohead_wu_zhouyu1    herohead_big_wu_zhouyu1    wu_zhouyu01    530012_Wu_Zhouyu_A/wu-zhouyupf-xs_SkeletonData                    9999
5300130                xiaoqiao    [0,450,1,0]    0|0|0    herohead_wu_xiaoqiao    herohead_big_wu_xiaoqiao    wu_xiaoqiaoOrg    530013_Wu_Xiaoqiao/Wu_Xiaoqiao_xs_SkeletonData                    
5300131    旧约诗行    countryBG30131        xiaoqiaopifu1    [-48,450,0.75,0]    0|0|0    herohead_wu_xiaoqiao1    herohead_big_wu_xiaoqiao1    wu_xiaoqiao01    530013_Wu_Xiaoqiao_A/wu_xiaoqiao_xs_SkeletonData                    9999
5300140                530014_Wu_Bulianshi/wu_bulianshi_SkeletonData    [10,-20,1,0]    0|0|0    herohead_wu_bulianshi    herohead_big_wu_bulianshi    wu_bulianshiOrg    530014_Wu_Bulianshi/wu-bulianshi-xr_SkeletonData                    
5300141    冰之圣女    countryBG30141        530014_Wu_Bulianshi/wu_bulianshi_SkeletonData    [10,-10,1,0]    0|0|0    herohead_wu_bulianshi1    herohead_big_wu_bulianshi1    wu_bulianshi01    530014_Wu_Bulianshi/wu-bulianshi-xr_SkeletonData                    22
5300141    冰之圣女    countryBG30141        bulianshi1    [10,-10,1,0]    0|0|0    herohead_wu_bulianshi1    herohead_big_wu_bulianshi1    wu_bulianshi01    530014_Wu_Bulianshi_A/wu-bulianshipf-xs_SkeletonData                    22
5300150                sunjian    [-30,430,1.05,0]    0|0|0    herohead_wu_sunjian    herohead_big_wu_sunjian        530015_Wu_Sunjian/Wu_Sunjian_xs_SkeletonData                    
5300151    黑浊骑士            sunjian    [-30,430,1.05,0]    0|0|0    herohead_wu_sunjian    herohead_big_wu_sunjian        530015_Wu_Sunjian/Wu_Sunjian_xs_SkeletonData                    9999
5300160                luxun    [140,545,0.75,0]    0|0|0    herohead_wu_luxun    herohead_big_wu_luxun    wu_luxunOrg    530016_Wu_Luxun/wu_luxun_xs_SkeletonData                    
Config/Icon.txt
@@ -295,6 +295,7 @@
countryBG40161    FullScreenBg    zuociBG01
countryBG30161    FullScreenBg    luxunBG01
countryBG20161    FullScreenBg    machaoBG01
countryBG20171    FullScreenBg    mayunluBG01
countryBG10131    FullScreenBg    zhenfuBG01
countryBG10171    FullScreenBg    zhangchunhuaBG01
countryBG40171    FullScreenBg    huamanBG01
Config/Mail.txt
@@ -49,3 +49,5 @@
FamilyGCZAwardScore    攻城战公会排名奖励    您在攻城战活动公会积分排名中夺得第<color=#109d06>{0}</color>名,奖励未领取,通过邮件补发,请注意查收!
FamilyGCZAwardGuess    攻城战竞猜奖励    您在攻城战活动竞猜奖励未领取,通过邮件补发,请注意查收!
FamilyGCZRecycleItem    攻城战道具回收    攻城战活动已结束,您未使用的<Word info=item ID={0}/><color=#109d06>x{1}</color>已被回收!
ActLianqiBillAward    炼器大会榜奖励补发    您在跨服炼器大会排行活动中夺得第<color=#109d06>{0}</color>名,奖励未领取,通过邮件补发,请注意查收!
ActLianqiRecycleItem    炼器大会道具回收    炼器大会活动已结束,您未使用的<a><Word info=item ID={0}/>|showitem={0}</a><color=#109d06>x{0}</color>已被回收,转为对应数量的元宝,请注意查收!
Config/Store.txt
@@ -204,3 +204,12 @@
7024    29    5    20    1    []    0    20    38    0    100    0    0    0    0            
7025    29    6    5    1    []    0    19    38    0    100    0    0    0    0            
7026    29    7    3    10    []    0    50    38    0    40    0    0    0    0            
11000    100    1    3    25    []    2    1    45    0    0    0    0    0    0
11001    100    2    1046    10    []    2    5    45    0    500    0    0    0    0
11002    100    3    13    20    []    2    20    45    0    200    0    0    0    0
11003    100    4    20    5    []    2    10    45    0    300    0    0    0    0
11004    100    5    2    15000    []    2    10    45    0    100    0    0    0    0
11005    100    6    1029    1    []    2    10    45    0    250    0    0    0    0
11006    100    7    200    10    []    2    50    45    0    50    0    0    0    0
11007    100    8    21    10    []    2    50    45    0    50    0    0    0    0
11008    100    9    7    500    []    2    99    45    0    10    0    0    0    0
Config/SysInfo.txt
@@ -217,3 +217,4 @@
GuildAtkDefBat5    0    0    2    进攻次数不足    
GuildAtkDefBat6    0    0    2    对手公会已解散,请等待至休战期完成结算    
JumpSkinErr    0    0    2    皮肤未开放    
LianqiMoveUnable    0    0    2    朝该方向无法继续移动或合成
Config/Zhanling.txt
@@ -126,6 +126,17 @@
817    8    3610    17    [[31,10]]    [[31,30],[30,240]]    []
818    8    3810    18    [[30,10]]    [[31,35],[30,280]]    []
819    8    4010    19    [[31,10]]    [[31,35],[30,280]]    []
900    9    100    0    [[1,10]]    [[2,1000]]    [[3,50], [7,100]]
901    9    200    1    [[1,11]]    [[2,1100]]    [[3,50], [7,200]]
902    9    500    2    [[1,12]]    [[2,1200]]    [[3,50], [7,300]]
903    9    1000    3    [[1,13]]    [[2,1300]]    [[3,50], [7,400]]
904    9    2000    4    [[1,14]]    [[2,1400]]    [[3,50], [7,500]]
905    9    3000    5    [[1,15]]    [[2,1500]]    [[3,50], [7,600]]
906    9    4000    6    [[1,16]]    [[2,1600]]    [[3,50], [7,700]]
907    9    5000    7    [[1,17]]    [[2,1700]]    [[3,50], [7,800]]
908    9    6000    8    [[1,18]]    [[2,1800]]    [[3,50], [7,900]]
909    9    7000    9    [[1,19]]    [[2,1900]]    [[3,50], [7,1000]]
910    9    10000    10    [[1,20]]    [[2,2000]]    [[3,50], [7,1100]]
10000    100    10    0    [[501,1]]    [[501,5]]    [[501,10],[501,10]]
10001    100    20    1    [[501,1]]    [[501,5]]    [[501,10],[501,10]]
10002    100    30    2    [[501,1]]    [[501,5]]    [[501,10],[501,10]]
UI/GuildAtkDefBatTreasureWin.prefab
@@ -690,7 +690,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
  m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -713,7 +713,7 @@
  m_Text: 40
  m_IsKey: 0
  m_KeyName: 
  m_ColorType: 0
  m_ColorType: 16
  m_BGColorType: 0
--- !u!114 &6537145411884102114
MonoBehaviour:
@@ -1290,7 +1290,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
  m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -1313,7 +1313,7 @@
  m_Text: 40
  m_IsKey: 0
  m_KeyName: 
  m_ColorType: 0
  m_ColorType: 16
  m_BGColorType: 0
--- !u!114 &1808188858986459533
MonoBehaviour:
@@ -1928,7 +1928,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
  m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -1951,7 +1951,7 @@
  m_Text: 40
  m_IsKey: 0
  m_KeyName: 
  m_ColorType: 0
  m_ColorType: 16
  m_BGColorType: 0
--- !u!114 &4469028668671153791
MonoBehaviour:
@@ -2308,7 +2308,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
  m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -2331,7 +2331,7 @@
  m_Text: 40
  m_IsKey: 0
  m_KeyName: 
  m_ColorType: 0
  m_ColorType: 16
  m_BGColorType: 0
--- !u!114 &3400218840444899894
MonoBehaviour:
@@ -4829,7 +4829,7 @@
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 2100000, guid: 67c581adb87b67642b527f05017d7741, type: 2}
  m_Color: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -4852,7 +4852,7 @@
  m_Text: 40
  m_IsKey: 0
  m_KeyName: 
  m_ColorType: 0
  m_ColorType: 16
  m_BGColorType: 0
--- !u!114 &1170840425577792436
MonoBehaviour:
UI/GuildAtkDefBatWin.prefab
@@ -776,7 +776,7 @@
    m_BestFit: 0
    m_MinSize: 10
    m_MaxSize: 40
    m_Alignment: 4
    m_Alignment: 3
    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 1
@@ -8632,7 +8632,7 @@
    m_BestFit: 0
    m_MinSize: 10
    m_MaxSize: 40
    m_Alignment: 4
    m_Alignment: 3
    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 1