Merge branch 'main' of ssh://192.168.0.8:29418/XianJing into hy_new

Assets/Content/Icons/FrameNew/ic_card_red.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: bfecc1c7b0d320045ac3b90cd35f7c0f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/CsvToLua/CsvToLua.cs

@@ -155,6 +155,11 @@ return aaa";
         }
 
         IsObj =  GUILayout.Toggle(IsObj,"运行时启动");
+
+        if (GUILayout.Button("更改CardCfg"))
+        {
+            ChangeLuaCfg("Assets/Lua/Config/CardCfg.lua", "Assets\\Editor\\CsvToLua\\LuaCfg.lua", "Build/NewCfg/CardCfg.lua");
+        }
     }
 
     public static string GetFilePath()
@@ -531,11 +536,11 @@ return aaa";
     
     }
 
-    private static void SetLuaLine(string[] rowDatas,int id,string key,string data)
+    private static void SetLuaLine(string[] rowDatas,int id,string key,string data,string dataF = "'{0}',")
     {
         string idkey = $"[{id}]";
         string keykey = $"'{key}'";
-        string wdata = $"'{data}',";
+        string wdata = string.Format(dataF,data);//$"'{data}',";
         bool isFind = false;
         for (int line = 0; line < rowDatas.Length; line++)
         {
@@ -669,5 +674,36 @@ return aaa";
     }
 
 
+
+    private static void ChangeLuaCfg(string luacfgpath,string luachagepath,string outputPath)
+    {
+        string[] rowDatas = File.ReadAllLines(luacfgpath);
+        using (LuaState runTime = new LuaState())
+        {
+            runTime.Start();
+            LuaTable luaTable = runTime.DoFile<LuaTable>(luachagepath);
+            RolePreviewWindow.LuaForEach<int, LuaTable>(runTime, luacfgpath, (id, luatable) => 
+            {
+                LuaFunction luaFunction = luaTable.GetLuaFunction("IsChangefg");
+
+                bool ischange = luaFunction.Invoke<LuaTable,LuaTable, bool>(luaTable,luatable);
+
+                if (ischange)
+                {
+                    LuaTable fieldValue = luaTable.Invoke<LuaTable,LuaTable>("GetFieldAddValue", luaTable);
+
+                    string field = fieldValue.RawGet<string, string>("field");
+                    string value = fieldValue.RawGet<string, string>("value");
+
+                    SetLuaLine(rowDatas,id,field,value.ToString(),"{0},");
+                    
+                }
+            });
+        
+        }
+
+
+        File.WriteAllLines(outputPath, rowDatas);
+    }
     
 }

Assets/Editor/CsvToLua/LuaCfg.lua

@@ -0,0 +1,38 @@
+local LuaCfg = {}
+
+LuaCfg.cardChangeList = 
+{
+    '席琳基米卡片',
+    '莎拉·艾琳卡片',
+    '魔王夢羅克卡片',
+    '天使月夜貓卡片',
+    '亡者君主卡片',
+    '元素使西里亞卡片',
+    '夢羅克的門徒卡片',
+    '死神安庫卡片',
+    '冷豔舞姬卡片',
+    '搞笑藝人卡片',
+    '納户特基格卡片',
+    '聖殿十字軍卡片',
+}
+
+
+
+function LuaCfg:IsChangefg(cardCfg)
+    
+    for _, v in ipairs(self.cardChangeList) do
+        if v == cardCfg.CardName then
+            return true
+        end
+    end
+
+    return false
+end
+
+
+function LuaCfg:GetFieldAddValue()
+    return {field = "CardType" ,value = '4'}
+end
+
+
+return LuaCfg

Assets/Editor/CsvToLua/LuaCfg.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6c2e6c837c2e564789617bbdf1fc780
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Config/CardCfg.lua

@@ -8068,7 +8068,7 @@ local CardCfg = {
 ['CardName']='席琳基米卡片',
 ['FromCardId']=0,
 ['ToCardId']=22200,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=1,
 ['Attribute1']={{8,100},{9,2000},{10,2000},{15,100}},
@@ -8086,7 +8086,7 @@ local CardCfg = {
 ['CardName']='莎拉·艾琳卡片',
 ['FromCardId']=0,
 ['ToCardId']=22201,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=1,
 ['Attribute1']={{7,20000},{8,100},{11,1400},{12,1400}},
@@ -8104,7 +8104,7 @@ local CardCfg = {
 ['CardName']='魔王夢羅克卡片',
 ['FromCardId']=0,
 ['ToCardId']=22202,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=1,
 ['Attribute1']={{7,32000},{9,1800},{10,1800},{14,150}},
@@ -8122,7 +8122,7 @@ local CardCfg = {
 ['CardName']='天使月夜貓卡片',
 ['FromCardId']=0,
 ['ToCardId']=22203,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=1,
 ['Attribute1']={{7,32000},{95,1500},{96,1500},{16,150}},
@@ -8140,7 +8140,7 @@ local CardCfg = {
 ['CardName']='亡者君主卡片',
 ['FromCardId']=0,
 ['ToCardId']=22204,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=1,
 ['Attribute1']={{9,5600},{93,1000},{15,100},{97,1000}},
@@ -8158,7 +8158,7 @@ local CardCfg = {
 ['CardName']='元素使西里亞卡片',
 ['FromCardId']=0,
 ['ToCardId']=22205,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=1,
 ['Attribute1']={{10,5600},{94,1000},{15,100},{97,1000}},
@@ -8176,7 +8176,7 @@ local CardCfg = {
 ['CardName']='夢羅克的門徒卡片',
 ['FromCardId']=0,
 ['ToCardId']=22206,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=1,
 ['Attribute1']={{9,1600},{10,1600},{12,3000},{16,150}},
@@ -8194,7 +8194,7 @@ local CardCfg = {
 ['CardName']='死神安庫卡片',
 ['FromCardId']=0,
 ['ToCardId']=22207,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=1,
 ['Attribute1']={{7,24000},{12,3000},{95,980},{96,980}},
@@ -8212,7 +8212,7 @@ local CardCfg = {
 ['CardName']='冷豔舞姬卡片',
 ['FromCardId']=0,
 ['ToCardId']=22208,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=1,
 ['Attribute1']={{9,1600},{10,1600},{11,3000},{15,100}},
@@ -8230,7 +8230,7 @@ local CardCfg = {
 ['CardName']='搞笑藝人卡片',
 ['FromCardId']=0,
 ['ToCardId']=22209,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=1,
 ['Attribute1']={{7,24000},{11,3000},{95,980},{96,980}},
@@ -8248,7 +8248,7 @@ local CardCfg = {
 ['CardName']='納户特基格卡片',
 ['FromCardId']=0,
 ['ToCardId']=22210,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=1,
 ['Attribute1']={{10,3000},{94,850},{96,850},{13,200}},
@@ -8266,7 +8266,7 @@ local CardCfg = {
 ['CardName']='聖殿十字軍卡片',
 ['FromCardId']=0,
 ['ToCardId']=22211,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=1,
 ['Attribute1']={{9,3000},{93,850},{95,850},{13,200}},
@@ -8284,7 +8284,7 @@ local CardCfg = {
 ['CardName']='席琳基米卡片',
 ['FromCardId']=22100,
 ['ToCardId']=22300,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=2,
 ['Attribute1']={{8,140},{9,2400},{10,2400},{15,150}},
@@ -8302,7 +8302,7 @@ local CardCfg = {
 ['CardName']='莎拉·艾琳卡片',
 ['FromCardId']=22101,
 ['ToCardId']=22301,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=2,
 ['Attribute1']={{7,25000},{8,140},{11,1700},{12,1700}},
@@ -8320,7 +8320,7 @@ local CardCfg = {
 ['CardName']='魔王夢羅克卡片',
 ['FromCardId']=22102,
 ['ToCardId']=22302,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=2,
 ['Attribute1']={{7,40000},{9,2200},{10,2200},{14,220}},
@@ -8338,7 +8338,7 @@ local CardCfg = {
 ['CardName']='天使月夜貓卡片',
 ['FromCardId']=22103,
 ['ToCardId']=22303,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=2,
 ['Attribute1']={{7,40000},{95,1880},{96,1880},{16,225}},
@@ -8356,7 +8356,7 @@ local CardCfg = {
 ['CardName']='亡者君主卡片',
 ['FromCardId']=22104,
 ['ToCardId']=22304,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=2,
 ['Attribute1']={{9,7000},{93,1200},{15,150},{97,1200}},
@@ -8374,7 +8374,7 @@ local CardCfg = {
 ['CardName']='元素使西里亞卡片',
 ['FromCardId']=22105,
 ['ToCardId']=22305,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=2,
 ['Attribute1']={{10,7000},{94,1200},{15,150},{97,1200}},
@@ -8392,7 +8392,7 @@ local CardCfg = {
 ['CardName']='夢羅克的門徒卡片',
 ['FromCardId']=22106,
 ['ToCardId']=22306,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=2,
 ['Attribute1']={{9,1800},{10,1800},{12,3700},{16,225}},
@@ -8410,7 +8410,7 @@ local CardCfg = {
 ['CardName']='死神安庫卡片',
 ['FromCardId']=22107,
 ['ToCardId']=22307,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=2,
 ['Attribute1']={{7,30000},{12,3700},{95,1220},{96,1220}},
@@ -8428,7 +8428,7 @@ local CardCfg = {
 ['CardName']='冷豔舞姬卡片',
 ['FromCardId']=22108,
 ['ToCardId']=22308,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=2,
 ['Attribute1']={{9,1800},{10,1800},{11,3700},{15,150}},
@@ -8446,7 +8446,7 @@ local CardCfg = {
 ['CardName']='搞笑藝人卡片',
 ['FromCardId']=22109,
 ['ToCardId']=22309,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=2,
 ['Attribute1']={{7,30000},{11,3700},{95,1220},{96,1220}},
@@ -8464,7 +8464,7 @@ local CardCfg = {
 ['CardName']='納户特基格卡片',
 ['FromCardId']=22110,
 ['ToCardId']=22310,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=2,
 ['Attribute1']={{10,3600},{94,1000},{96,1000},{13,240}},
@@ -8482,7 +8482,7 @@ local CardCfg = {
 ['CardName']='聖殿十字軍卡片',
 ['FromCardId']=22111,
 ['ToCardId']=22311,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=2,
 ['Attribute1']={{9,3600},{93,1000},{95,1000},{13,240}},
@@ -8500,7 +8500,7 @@ local CardCfg = {
 ['CardName']='席琳基米卡片',
 ['FromCardId']=22200,
 ['ToCardId']=22400,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=3,
 ['Attribute1']={{8,180},{9,3000},{10,3000},{15,220}},
@@ -8518,7 +8518,7 @@ local CardCfg = {
 ['CardName']='莎拉·艾琳卡片',
 ['FromCardId']=22201,
 ['ToCardId']=22401,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=3,
 ['Attribute1']={{7,30000},{8,180},{11,2100},{12,2100}},
@@ -8536,7 +8536,7 @@ local CardCfg = {
 ['CardName']='魔王夢羅克卡片',
 ['FromCardId']=22202,
 ['ToCardId']=22402,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=3,
 ['Attribute1']={{7,47000},{9,2800},{10,2800},{14,260}},
@@ -8554,7 +8554,7 @@ local CardCfg = {
 ['CardName']='天使月夜貓卡片',
 ['FromCardId']=22203,
 ['ToCardId']=22403,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=3,
 ['Attribute1']={{7,47000},{95,2340},{96,2340},{16,330}},
@@ -8572,7 +8572,7 @@ local CardCfg = {
 ['CardName']='亡者君主卡片',
 ['FromCardId']=22204,
 ['ToCardId']=22404,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=3,
 ['Attribute1']={{9,8400},{93,1420},{15,220},{97,1420}},
@@ -8590,7 +8590,7 @@ local CardCfg = {
 ['CardName']='元素使西里亞卡片',
 ['FromCardId']=22205,
 ['ToCardId']=22405,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=3,
 ['Attribute1']={{10,8400},{94,1420},{15,220},{97,1420}},
@@ -8608,7 +8608,7 @@ local CardCfg = {
 ['CardName']='夢羅克的門徒卡片',
 ['FromCardId']=22206,
 ['ToCardId']=22406,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=3,
 ['Attribute1']={{9,2200},{10,2200},{12,4300},{16,330}},
@@ -8626,7 +8626,7 @@ local CardCfg = {
 ['CardName']='死神安庫卡片',
 ['FromCardId']=22207,
 ['ToCardId']=22407,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=3,
 ['Attribute1']={{7,35000},{12,4300},{95,1460},{96,1460}},
@@ -8644,7 +8644,7 @@ local CardCfg = {
 ['CardName']='冷豔舞姬卡片',
 ['FromCardId']=22208,
 ['ToCardId']=22408,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=3,
 ['Attribute1']={{9,2200},{10,2200},{11,4300},{15,220}},
@@ -8662,7 +8662,7 @@ local CardCfg = {
 ['CardName']='搞笑藝人卡片',
 ['FromCardId']=22209,
 ['ToCardId']=22409,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=3,
 ['Attribute1']={{7,35000},{11,4300},{95,1460},{96,1460}},
@@ -8680,7 +8680,7 @@ local CardCfg = {
 ['CardName']='納户特基格卡片',
 ['FromCardId']=22210,
 ['ToCardId']=22410,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=3,
 ['Attribute1']={{10,4800},{94,1200},{96,1200},{13,280}},
@@ -8698,7 +8698,7 @@ local CardCfg = {
 ['CardName']='聖殿十字軍卡片',
 ['FromCardId']=22211,
 ['ToCardId']=22411,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=3,
 ['Attribute1']={{9,4800},{93,1200},{95,1200},{13,280}},
@@ -8716,7 +8716,7 @@ local CardCfg = {
 ['CardName']='席琳基米卡片',
 ['FromCardId']=22300,
 ['ToCardId']=22500,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=4,
 ['Attribute1']={{8,250},{9,3500},{10,3500},{15,340}},
@@ -8734,7 +8734,7 @@ local CardCfg = {
 ['CardName']='莎拉·艾琳卡片',
 ['FromCardId']=22301,
 ['ToCardId']=22501,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=4,
 ['Attribute1']={{7,36000},{8,250},{11,2500},{12,2500}},
@@ -8752,7 +8752,7 @@ local CardCfg = {
 ['CardName']='魔王夢羅克卡片',
 ['FromCardId']=22302,
 ['ToCardId']=22502,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=4,
 ['Attribute1']={{7,57000},{9,3300},{10,3300},{14,320}},
@@ -8770,7 +8770,7 @@ local CardCfg = {
 ['CardName']='天使月夜貓卡片',
 ['FromCardId']=22303,
 ['ToCardId']=22503,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=4,
 ['Attribute1']={{7,57000},{95,2720},{96,2720},{16,510}},
@@ -8788,7 +8788,7 @@ local CardCfg = {
 ['CardName']='亡者君主卡片',
 ['FromCardId']=22304,
 ['ToCardId']=22504,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=4,
 ['Attribute1']={{9,10000},{93,1760},{15,340},{97,1760}},
@@ -8806,7 +8806,7 @@ local CardCfg = {
 ['CardName']='元素使西里亞卡片',
 ['FromCardId']=22305,
 ['ToCardId']=22505,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=4,
 ['Attribute1']={{10,10000},{94,1760},{15,340},{97,1760}},
@@ -8824,7 +8824,7 @@ local CardCfg = {
 ['CardName']='夢羅克的門徒卡片',
 ['FromCardId']=22306,
 ['ToCardId']=22506,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=4,
 ['Attribute1']={{9,2700},{10,2700},{12,5200},{16,510}},
@@ -8842,7 +8842,7 @@ local CardCfg = {
 ['CardName']='死神安庫卡片',
 ['FromCardId']=22307,
 ['ToCardId']=22507,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=4,
 ['Attribute1']={{7,43000},{12,5200},{95,1760},{96,1760}},
@@ -8860,7 +8860,7 @@ local CardCfg = {
 ['CardName']='冷豔舞姬卡片',
 ['FromCardId']=22308,
 ['ToCardId']=22508,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=4,
 ['Attribute1']={{9,2700},{10,2700},{11,5200},{15,340}},
@@ -8878,7 +8878,7 @@ local CardCfg = {
 ['CardName']='搞笑藝人卡片',
 ['FromCardId']=22309,
 ['ToCardId']=22509,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=4,
 ['Attribute1']={{7,43000},{11,5200},{95,1760},{96,1760}},
@@ -8896,7 +8896,7 @@ local CardCfg = {
 ['CardName']='納户特基格卡片',
 ['FromCardId']=22310,
 ['ToCardId']=22510,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=4,
 ['Attribute1']={{10,6000},{94,1450},{96,1450},{13,350}},
@@ -8914,7 +8914,7 @@ local CardCfg = {
 ['CardName']='聖殿十字軍卡片',
 ['FromCardId']=22311,
 ['ToCardId']=22511,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=4,
 ['Attribute1']={{9,6000},{93,1450},{95,1450},{13,350}},
@@ -8932,7 +8932,7 @@ local CardCfg = {
 ['CardName']='席琳基米卡片',
 ['FromCardId']=22400,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=5,
 ['Attribute1']={{8,300},{9,4200},{10,4200},{15,400}},
@@ -8950,7 +8950,7 @@ local CardCfg = {
 ['CardName']='莎拉·艾琳卡片',
 ['FromCardId']=22401,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=1,
 ['CardLevel']=5,
 ['Attribute1']={{7,43000},{8,300},{11,3200},{12,3200}},
@@ -8968,7 +8968,7 @@ local CardCfg = {
 ['CardName']='魔王夢羅克卡片',
 ['FromCardId']=22402,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=5,
 ['Attribute1']={{7,68000},{9,4000},{10,4000},{14,450}},
@@ -8986,7 +8986,7 @@ local CardCfg = {
 ['CardName']='天使月夜貓卡片',
 ['FromCardId']=22403,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=2,
 ['CardLevel']=5,
 ['Attribute1']={{7,68000},{95,3000},{96,3000},{16,600}},
@@ -9004,7 +9004,7 @@ local CardCfg = {
 ['CardName']='亡者君主卡片',
 ['FromCardId']=22404,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=5,
 ['Attribute1']={{9,12000},{93,2000},{15,400},{97,2000}},
@@ -9022,7 +9022,7 @@ local CardCfg = {
 ['CardName']='元素使西里亞卡片',
 ['FromCardId']=22405,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=3,
 ['CardLevel']=5,
 ['Attribute1']={{10,12000},{94,2000},{15,400},{97,2000}},
@@ -9040,7 +9040,7 @@ local CardCfg = {
 ['CardName']='夢羅克的門徒卡片',
 ['FromCardId']=22406,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=5,
 ['Attribute1']={{9,3500},{10,3500},{12,6000},{16,600}},
@@ -9058,7 +9058,7 @@ local CardCfg = {
 ['CardName']='死神安庫卡片',
 ['FromCardId']=22407,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=4,
 ['CardLevel']=5,
 ['Attribute1']={{7,52000},{12,6000},{95,2100},{96,2100}},
@@ -9076,7 +9076,7 @@ local CardCfg = {
 ['CardName']='冷豔舞姬卡片',
 ['FromCardId']=22408,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=5,
 ['Attribute1']={{9,3500},{10,3500},{11,6000},{15,400}},
@@ -9094,7 +9094,7 @@ local CardCfg = {
 ['CardName']='搞笑藝人卡片',
 ['FromCardId']=22409,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=5,
 ['CardLevel']=5,
 ['Attribute1']={{7,52000},{11,6000},{95,2100},{96,2100}},
@@ -9112,7 +9112,7 @@ local CardCfg = {
 ['CardName']='納户特基格卡片',
 ['FromCardId']=22410,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=5,
 ['Attribute1']={{10,8000},{94,1800},{96,1800},{13,450}},
@@ -9130,7 +9130,7 @@ local CardCfg = {
 ['CardName']='聖殿十字軍卡片',
 ['FromCardId']=22411,
 ['ToCardId']=0,
-['CardType']=3,
+['CardType']=4,
 ['CardLocation']=6,
 ['CardLevel']=5,
 ['Attribute1']={{9,8000},{93,1800},{95,1800},{13,450}},
@@ -9144,4 +9144,4 @@ local CardCfg = {
 ['UpCost']=0,
 },
 }
-return CardCfg
+return CardCfg

Assets/Lua/Core/Constant.lua

@@ -29,7 +29,7 @@ local Constant = {
 
     CardLocation_Icons = { "Cards/ic_card_hat", "Cards/ic_card_clothes", "Cards/ic_card_weapon", "Cards/ic_card_cloak", "Cards/ic_card_shoes", "Cards/ic_card_jewelry" },
 
-    Card_Quality_Icons = {"FrameNew/ic_card_blue", "FrameNew/ic_card_purple", "FrameNew/ic_card_gold"},
+    Card_Quality_Icons = {"FrameNew/ic_card_blue", "FrameNew/ic_card_purple", "FrameNew/ic_card_gold","FrameNew/ic_card_red"},
     Card_Quality_L_Icons = {"FrameNew/ic_card_blue_l", "FrameNew/ic_card_purple_l", "FrameNew/ic_card_gold_l"},
 
     Pet_Quality_Bg_Icons = {"FrameNew/frame_advence_normal", "FrameNew/frame_advence_normal", "FrameNew/frame_advence_mini", "FrameNew/frame_advence_mvp"},