diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon/Grass_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node1/Normal/Grass_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node1/Normal/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon/Tree1_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node2/Normal/Tree1_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node2/Normal/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon/Tree2_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node3/Normal/Tree2_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node3/Normal/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon/Tree3_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node4/Normal/Tree3_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node4/Normal/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon/Island_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/Option3.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_1.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option1.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_1.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option1.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option1.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_1.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option1.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_2.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option2.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_2.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option2.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_2.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option2.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_2.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option2.png.meta diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_3.png b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option3.png similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_3.png rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option3.png diff --git a/Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_3.png.meta b/Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option3.png.meta similarity index 100% rename from Forest/Assets/Art/GameBuild/Texture/Series_Spring/Node5/Normal/Island_3.png.meta rename to Forest/Assets/Art/GameBuild/Texture/Build_1/Node5/Normal/Option3.png.meta diff --git a/Forest/Assets/Config/Build/Build_1.json b/Forest/Assets/Config/Build/Build_1.json index a1e36cb..4e53c23 100644 --- a/Forest/Assets/Config/Build/Build_1.json +++ b/Forest/Assets/Config/Build/Build_1.json @@ -34,7 +34,7 @@ "Option2", "Option3" ], - "IconPath": "Assets/Art/GameBuild/Texture/Series_Spring/Node1/Icon" + "IconPath": "Assets/Art/GameBuild/Texture/Build_1/Node1/Icon/{0}.png" }, { "name": "Node2", @@ -43,7 +43,7 @@ "Option2", "Option3" ], - "IconPath": "Assets/Art/GameBuild/Texture/Series_Spring/Node2/Icon" + "IconPath": "Assets/Art/GameBuild/Texture/Build_1/Node2/Icon/{0}.png" }, { "name": "Node3", @@ -52,7 +52,7 @@ "Option2", "Option3" ], - "IconPath": "Assets/Art/GameBuild/Texture/Series_Spring/Node3/Icon" + "IconPath": "Assets/Art/GameBuild/Texture/Build_1/Node3/Icon/{0}.png" }, { "name": "Node4", @@ -61,7 +61,7 @@ "Option2", "Option3" ], - "IconPath": "Assets/Art/GameBuild/Texture/Series_Spring/Node4/Icon" + "IconPath": "Assets/Art/GameBuild/Texture/Build_1/Node4/Icon/{0}.png" }, { "name": "Node5", @@ -70,7 +70,7 @@ "Option2", "Option3" ], - "IconPath": "Assets/Art/GameBuild/Texture/Series_Spring/Node5/Icon" + "IconPath": "Assets/Art/GameBuild/Texture/Build_1/Node5/Icon/{0}.png" } ] } \ No newline at end of file diff --git a/Forest/Assets/Editor/GameBuild/GameBuildWindow.cs b/Forest/Assets/Editor/GameBuild/GameBuildWindow.cs index ed0dc43..6dc4327 100644 --- a/Forest/Assets/Editor/GameBuild/GameBuildWindow.cs +++ b/Forest/Assets/Editor/GameBuild/GameBuildWindow.cs @@ -99,7 +99,7 @@ public class GameBuildWindow : OdinEditorWindow editorNode.BuildNode = node; if (!string.IsNullOrEmpty(node.IconPath)) - editorNode.optionPath = node.IconPath.Replace("Icon", "Normal"); + editorNode.optionPath = node.IconPath.Replace("Icon/{0}.png", "Normal"); editorNodes.Add(editorNode); } } @@ -259,7 +259,7 @@ public class GameBuildWindow : OdinEditorWindow sortingOrder++; //初始化Icon资源路径 - editorNode.BuildNode.IconPath = editorNode.optionPath.Replace("Normal", "Icon"); + editorNode.BuildNode.IconPath = editorNode.optionPath.Replace("Normal", "Icon/{0}.png"); } } diff --git a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs index 4cf24d0..6a70210 100644 --- a/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/BuildManager.cs @@ -102,7 +102,7 @@ namespace Framework.Manager { public string Name; - public string IconName; + public string IconPath; //按主题解锁条件 public int Condition; @@ -337,9 +337,7 @@ namespace Framework.Manager { foreach (var optionInfo in nodeInfo.Options.Values) { - var index = GameBuildUtils.ExtractNumber(optionInfo.Name); - - optionInfo.IconName = await InitOptionIcon(nodeInfo.IconPath, index); + optionInfo.IconPath = await InitOptionIcon(nodeInfo.IconPath, optionInfo.Name); } } } @@ -352,26 +350,15 @@ namespace Framework.Manager /// /// 初始化加载选项图标 /// - private async UniTask InitOptionIcon(string iconsPath, int index) + private async UniTask InitOptionIcon(string iconsPath, string optionName) { try { - var path = iconsPath.Replace(Application.dataPath, "").Replace('\\', '/'); - DebugUtil.LogError("路径:{0}", path); - var fileEntries = Directory.GetFiles(path, "*.png"); - foreach (var filePath in fileEntries) - { - var fileName = Path.GetFileName(filePath); - var name = fileName.Replace(".png", ""); - if (GameBuildUtils.ExtractNumber(name) == index) - { - var assetPath = filePath.Replace(Application.dataPath, "").Replace('\\', '/'); - var sprite = await AssetManager.Instance.LoadAssetAsync(assetPath); - _iconSprites.TryAdd(name, sprite); - return name; - } - } - + var path = string.Format(iconsPath, optionName); + var assetPath = path.Replace(Application.dataPath, "").Replace('\\', '/'); + var sprite = await AssetManager.Instance.LoadAssetAsync(assetPath); + if (_iconSprites.TryAdd(path, sprite)) + return path; return null; } catch (Exception e) @@ -406,7 +393,7 @@ namespace Framework.Manager { if (nodeInfo.Options.TryGetValue(optionName, out var optionInfo)) { - if (_iconSprites.TryGetValue(optionInfo.IconName, out var sprite)) + if (_iconSprites.TryGetValue(optionInfo.IconPath, out var sprite)) return sprite; } } diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs index 8b622d6..7176288 100644 --- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs +++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs @@ -63,13 +63,6 @@ namespace Gameplay.LoadingExecutor var buildPath = string.Format(Framework.Constants.Constants.SceneBuildPath, buildId); var buildConfig = string.Format(Framework.Constants.Constants.BuildConfigPath, buildId); var buildData = await JsonHelper.LoadFromAddressable(buildConfig); - //Debug TODO 删除 - DebugUtil.LogError("当前buildID: {0}", buildData.buildID); - foreach (var nodeInfo in buildData.NodeInfos) - { - DebugUtil.LogError("加载{0}图标路径:{1}", nodeInfo.Name, nodeInfo.IconPath); - } - await BuildManager.Instance.Init(buildData, true, buildInfo); await Addressables.LoadSceneAsync(buildPath).ToUniTask(); }