v0.0.5

axieinfinity · Apr 1, 2024 · 993f8a7 · 993f8a7
1 parent f8fdac1
commit 993f8a7
Show file tree

Hide file tree

Showing 16 changed files with 474 additions and 59 deletions.
diff --git a/Assets/AxieInfinity/AxieMixerUnity/Components/Builder/Axie2dBuilder.cs b/Assets/AxieInfinity/AxieMixerUnity/Components/Builder/Axie2dBuilder.cs
@@ -19,10 +19,12 @@ public class Axie2dBuilderResult
     public class Axie2dBuilder
     {
         public IAxieMixerMaterials axieMixerMaterials { get; private set; }
+        public bool isGraphicLinear { get; private set; }
 
         public void Init(IAxieMixerMaterials axieMixerMaterials)
         {
             this.axieMixerMaterials = axieMixerMaterials;
+            this.isGraphicLinear = QualitySettings.activeColorSpace == ColorSpace.Linear;
         }
 
         public int GetSampleColorVariant(AxieCore.AxieMixer.CharacterClass characterClass, int colorValue)
@@ -95,7 +97,8 @@ public Axie2dBuilderResult BuildSpineAdultCombo(Dictionary<string, string> adult
             else
             {
                 builderResult.skeletonDataAsset = skeletonDataAsset;
-                builderResult.sharedGraphicMaterial = axieMixerMaterials.GetSampleGraphicMaterial(AxieFormType.Normal);
+                builderResult.sharedGraphicMaterial = isGraphicLinear ? axieMixerMaterials.GetSampleLinearGraphicMaterial(AxieFormType.Normal, colorVariant, 0) : //phuongnk - tmp solution shift value is not correct
+                                                                        axieMixerMaterials.GetSampleGraphicMaterial(AxieFormType.Normal);
             }
             return builderResult;
         }

diff --git a/Assets/AxieInfinity/AxieMixerUnity/Components/Core/IAxieMixerMaterials.cs b/Assets/AxieInfinity/AxieMixerUnity/Components/Core/IAxieMixerMaterials.cs
@@ -18,5 +18,6 @@ public interface IAxieMixerMaterials
         IAxieGenesStuff GetGenesStuff(AxieFormType formType);
         IAxieMixerStuff GetMixerStuff(AxieFormType formType);
         Material GetSampleGraphicMaterial(AxieFormType formType);
+        Material GetSampleLinearGraphicMaterial(AxieFormType formType, byte colorVariant, byte colorShift);
     }
 }
diff --git a/Assets/AxieInfinity/AxieMixerUnity/Components/Helper/AxieMixerMaterials.cs b/Assets/AxieInfinity/AxieMixerUnity/Components/Helper/AxieMixerMaterials.cs
@@ -20,7 +20,9 @@ public class SingleStuff {
             public IAxieGenesStuff axieGenesStuff;
             public IAxieMixerStuff axieMixerStuff;
             public Material sampleGraphicMaterial;
+            public Material sampleGraphicLinearMaterial;
             public Dictionary<string, Material> materials = new Dictionary<string, Material>();
+            public Dictionary<string, Material> variantMaterials = new Dictionary<string, Material>();
         }
         SingleStuff[ ] stuffs = new SingleStuff[(int)AxieFormType.Count];
 
@@ -45,6 +47,23 @@ public Material GetSampleGraphicMaterial(AxieFormType formType)
             return stuffs[(int)formType].sampleGraphicMaterial;
         }
 
+        public Material GetSampleLinearGraphicMaterial(AxieFormType formType, byte colorVariant, byte colorShift)
+        {
+            if (stuffs[(int)formType] == null) return null;
+            var stuff = stuffs[(int)formType];
+            string key = $"linear_{colorVariant}-{colorShift}";
+            Material ret;
+            if(stuff.variantMaterials.TryGetValue(key, out ret))
+            {
+                return ret;
+            }
+            ret = new Material(stuffs[(int)formType].sampleGraphicLinearMaterial);
+            ret.SetFloat("_ColorVariant", colorVariant);
+            ret.SetFloat("_ColorShift", colorShift);
+            stuff.variantMaterials.Add(key, ret);
+            return ret;
+        }
+
         public IAxieGenesStuff GetGenesStuff(AxieFormType formType) {
             if (stuffs[(int)formType] == null) return null;
             return stuffs[(int)formType].axieGenesStuff;
@@ -92,7 +111,15 @@ Dictionary<string, Material> baseMaterials
                 UnityEngine.Assertions.Assert.IsTrue(materials.Count == 1);
                 sampleGraphicMaterial = materials[0];
             }
-
+
+            Material sampleGraphicLinearMaterial = null;
+            if (baseMaterials.TryGetValue("graphic-linear", out var baseGraphicLinearMaterial))
+            {
+                List<Material> materials = LoadMaterials(atlasStuffSingle, baseGraphicLinearMaterial);
+                UnityEngine.Assertions.Assert.IsTrue(materials.Count == 1);
+                sampleGraphicLinearMaterial = materials[0];
+            }
+
             stuffs[(int)formType] = new SingleStuff
             {
                 atlasStuffs = atlasStuffs,
@@ -101,6 +128,7 @@ Dictionary<string, Material> baseMaterials
                 axieGenesStuff = axieGenesStuff,
                 axieMixerStuff = axieMixerStuff,
                 sampleGraphicMaterial = sampleGraphicMaterial,
+                sampleGraphicLinearMaterial = sampleGraphicLinearMaterial,
                 materials = baseMaterials
             };
         }

diff --git a/Assets/AxieInfinity/AxieMixerUnity/Resources/Sprites.meta b/Assets/AxieInfinity/AxieMixerUnity/Resources/Sprites.meta