Просмотр исходного кода

Merge branch 'sskin' of ssh://192.168.0.8:29418/XianJing into hy_test

ybx_Gdn 11 месяцев назад
Родитель
Сommit
4b0f454875

Разница между файлами не показана из-за своего большого размера
+ 218 - 280
Assets/Content/Prefabs/Models/Fashion_HeadTop/Maoxianjia_Women_HeadTop_01.prefab


BIN
Assets/Content/Raw_Art/headwear/Maoxianjia_Women_HeadTop/mesh/Maoxianjia_Women_HeadTop_01.FBX


+ 8 - 8
Assets/Lua/Config/FashionCfg.lua

@@ -3401,7 +3401,7 @@ local FashionCfg = {
 ['FashionHideHair']=false,
 ['FashionSex']=1,
 ['FashionOpen']=true,
-['FashionQuality']=3,
+['FashionQuality']=4,
 ['AttrNum']=3,
 ['SuitId']={262},
 ['FashionIcon']='Fashion/Zhuanbushi_UI_Women_Cloth_01',
@@ -3418,7 +3418,7 @@ local FashionCfg = {
     ['FashionHideHair']=false,
     ['FashionSex']=2,
     ['FashionOpen']=true,
-    ['FashionQuality']=3,
+    ['FashionQuality']=4,
     ['AttrNum']=3,
     ['SuitId']={263},
     ['FashionIcon']='Fashion/Zhuanbushi_UI_Man_Cloth_01',
@@ -3435,7 +3435,7 @@ local FashionCfg = {
 ['FashionHideHair']=false,
 ['FashionSex']=1,
 ['FashionOpen']=true,
-['FashionQuality']=3,
+['FashionQuality']=4,
 ['AttrNum']=3,
 ['SuitId']={264},
 ['FashionIcon']='Fashion/Zhanxingshi_UI_Women_Cloth_01',
@@ -3452,7 +3452,7 @@ local FashionCfg = {
     ['FashionHideHair']=false,
     ['FashionSex']=2,
     ['FashionOpen']=true,
-    ['FashionQuality']=3,
+    ['FashionQuality']=4,
     ['AttrNum']=3,
     ['SuitId']={265},
     ['FashionIcon']='Fashion/Zhanxingshi_UI_Man_Cloth_01',
@@ -3469,7 +3469,7 @@ local FashionCfg = {
 ['FashionHideHair']=false,
 ['FashionSex']=1,
 ['FashionOpen']=true,
-['FashionQuality']=3,
+['FashionQuality']=4,
 ['AttrNum']=3,
 ['SuitId']={266},
 ['FashionIcon']='Fashion/Xianxia_UI_Women_Cloth_01',
@@ -3486,7 +3486,7 @@ local FashionCfg = {
     ['FashionHideHair']=false,
     ['FashionSex']=2,
     ['FashionOpen']=true,
-    ['FashionQuality']=3,
+    ['FashionQuality']=4,
     ['AttrNum']=3,
     ['SuitId']={267},
     ['FashionIcon']='Fashion/Xianxia_UI_Man_Cloth_01',
@@ -3503,7 +3503,7 @@ local FashionCfg = {
 ['FashionHideHair']=false,
 ['FashionSex']=1,
 ['FashionOpen']=true,
-['FashionQuality']=3,
+['FashionQuality']=4,
 ['AttrNum']=3,
 ['SuitId']={268},
 ['FashionIcon']='Fashion/Maoxianjia_UI_Women_Cloth_01',
@@ -3520,7 +3520,7 @@ local FashionCfg = {
     ['FashionHideHair']=false,
     ['FashionSex']=2,
     ['FashionOpen']=true,
-    ['FashionQuality']=3,
+    ['FashionQuality']=4,
     ['AttrNum']=3,
     ['SuitId']={269},
     ['FashionIcon']='Fashion/Maoxianjia_UI_Man_Cloth_01',

+ 16 - 16
Assets/Lua/Config/ItemCfg2.lua

@@ -9004,7 +9004,7 @@ local ItemCfg2 = {
 ['Id']=30000,
 ['Name']='占卜师头饰(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9025,7 +9025,7 @@ local ItemCfg2 = {
 ['Id']=30001,
 ['Name']='占卜师头饰(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9046,7 +9046,7 @@ local ItemCfg2 = {
 ['Id']=30002,
 ['Name']='占星师帽子(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9067,7 +9067,7 @@ local ItemCfg2 = {
 ['Id']=30003,
 ['Name']='占星师帽子(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9088,7 +9088,7 @@ local ItemCfg2 = {
 ['Id']=30004,
 ['Name']='仙侠帽子(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9109,7 +9109,7 @@ local ItemCfg2 = {
 ['Id']=30005,
 ['Name']='仙侠帽子(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9130,7 +9130,7 @@ local ItemCfg2 = {
 ['Id']=30006,
 ['Name']='冒险家帽子(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9151,7 +9151,7 @@ local ItemCfg2 = {
 ['Id']=30007,
 ['Name']='冒险家帽子(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9172,7 +9172,7 @@ local ItemCfg2 = {
 ['Id']=30008,
 ['Name']='占卜师(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9193,7 +9193,7 @@ local ItemCfg2 = {
 ['Id']=30009,
 ['Name']='占卜师(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9214,7 +9214,7 @@ local ItemCfg2 = {
 ['Id']=30010,
 ['Name']='占星师(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9235,7 +9235,7 @@ local ItemCfg2 = {
 ['Id']=30011,
 ['Name']='占星师(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9256,7 +9256,7 @@ local ItemCfg2 = {
 ['Id']=30012,
 ['Name']='仙侠(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9277,7 +9277,7 @@ local ItemCfg2 = {
 ['Id']=30013,
 ['Name']='仙侠(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9298,7 +9298,7 @@ local ItemCfg2 = {
 ['Id']=30014,
 ['Name']='冒险家(女)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
@@ -9319,7 +9319,7 @@ local ItemCfg2 = {
 ['Id']=30015,
 ['Name']='冒险家(男)圖紙',
 ['ResType']=10,
-['Quality']=3,
+['Quality']=4,
 ['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,

Некоторые файлы не были показаны из-за большого количества измененных файлов