소스 검색

Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client

gsgundam 8 년 전
부모
커밋
47d0139763
100개의 변경된 파일206개의 추가작업 그리고 84개의 파일을 삭제
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. 1 1
      Assets/Resources/Font/SourceHanSansCN-Regular.otf.meta
  3. BIN
      Assets/Resources/Garden.unity
  4. BIN
      Assets/Resources/Logo.unity
  5. 1 1
      Assets/Resources/Prefab/Object.meta
  6. 1 1
      Assets/Resources/Prefab/Object/Bird.prefab.meta
  7. BIN
      Assets/Resources/Prefab/Object/Flower.prefab
  8. 1 1
      Assets/Resources/Prefab/Object/Flower.prefab.meta
  9. BIN
      Assets/Resources/Prefab/Object/Garden.prefab
  10. 1 1
      Assets/Resources/Prefab/Object/Garden.prefab.meta
  11. 1 1
      Assets/Resources/Prefab/Object/MainCamera.prefab.meta
  12. 1 1
      Assets/Resources/Prefab/Object/MusicMini.prefab.meta
  13. 1 1
      Assets/Resources/Prefab/Object/MusicTheme.prefab.meta
  14. 1 1
      Assets/Resources/Prefab/Object/Player.prefab.meta
  15. BIN
      Assets/Resources/Prefab/PrefabUI/Canvas.prefab
  16. 1 1
      Assets/Resources/Prefab/PrefabUI/Canvas.prefab.meta
  17. 1 1
      Assets/Resources/Prefab/PrefabUI/EventSystem.prefab.meta
  18. 1 1
      Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab.meta
  19. 1 1
      Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab.meta
  20. 1 1
      Assets/Resources/Prefab/PrefabUI/HudText.prefab.meta
  21. BIN
      Assets/Resources/Prefab/PrefabUI/SignInItem.prefab
  22. 1 1
      Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta
  23. 1 1
      Assets/Resources/Prefab/PrefabUI/SkillItem.prefab.meta
  24. 1 1
      Assets/Resources/Shader/Gray.shader.meta
  25. BIN
      Assets/Resources/Shader/GrayMat.mat
  26. 1 1
      Assets/Resources/Shader/GrayMat.mat.meta
  27. 105 0
      Assets/Resources/Shader/HighLight.shader
  28. 9 0
      Assets/Resources/Shader/HighLight.shader.meta
  29. BIN
      Assets/Resources/Shader/HighLightMat.mat
  30. 8 0
      Assets/Resources/Shader/HighLightMat.mat.meta
  31. 1 1
      Assets/Resources/Sprite/Character/上衣1.png.meta
  32. 1 1
      Assets/Resources/Sprite/Character/上衣2.png.meta
  33. 1 1
      Assets/Resources/Sprite/Character/上衣3.png.meta
  34. 1 1
      Assets/Resources/Sprite/Character/右手你的右手!!.PNG.meta
  35. 1 1
      Assets/Resources/Sprite/Character/嘴巴1.png.meta
  36. 1 1
      Assets/Resources/Sprite/Character/嘴巴2.png.meta
  37. 1 1
      Assets/Resources/Sprite/Character/嘴巴3.png.meta
  38. 1 1
      Assets/Resources/Sprite/Character/头饰品1.png.meta
  39. 1 1
      Assets/Resources/Sprite/Character/头饰品2.png.meta
  40. 1 1
      Assets/Resources/Sprite/Character/头饰品3.png.meta
  41. 1 1
      Assets/Resources/Sprite/Character/左手看清左手你的左手!!.png.meta
  42. 0 0
      Assets/Resources/Sprite/Character/技能黄鹂鸟.png
  43. 1 1
      Assets/Resources/Sprite/Character/技能黄鹂鸟.png.meta
  44. 1 1
      Assets/Resources/Sprite/Character/眼睛1.png.meta
  45. 1 1
      Assets/Resources/Sprite/Character/眼睛2.png.meta
  46. 1 1
      Assets/Resources/Sprite/Character/眼睛3.png.meta
  47. 1 1
      Assets/Resources/Sprite/Character/脑壳1.png.meta
  48. 1 1
      Assets/Resources/Sprite/Character/脑壳2.png.meta
  49. 1 1
      Assets/Resources/Sprite/Character/脑壳3.png.meta
  50. 1 1
      Assets/Resources/Sprite/Character/脖子.png.meta
  51. 1 1
      Assets/Resources/Sprite/Character/腿2个提供1个.png.meta
  52. 1 1
      Assets/Resources/Sprite/Character/裙子1.png.meta
  53. 1 1
      Assets/Resources/Sprite/Character/裙子2.png.meta
  54. 1 1
      Assets/Resources/Sprite/Character/裙子3.png.meta
  55. 1 1
      Assets/Resources/Sprite/Character/鞋子1.png.meta
  56. 1 1
      Assets/Resources/Sprite/Character/鞋子2.png.meta
  57. 1 1
      Assets/Resources/Sprite/Character/鞋子3.png.meta
  58. 0 0
      Assets/Resources/Sprite/Character/音符1.png
  59. 1 1
      Assets/Resources/Sprite/Character/音符1.png.meta
  60. 0 0
      Assets/Resources/Sprite/Character/音符2.png
  61. 1 1
      Assets/Resources/Sprite/Character/音符2.png.meta
  62. 0 0
      Assets/Resources/Sprite/Character/音符3.png
  63. 1 1
      Assets/Resources/Sprite/Character/音符3.png.meta
  64. 1 1
      Assets/Resources/Sprite/Garden/Flower1.png.meta
  65. 1 1
      Assets/Resources/Sprite/Garden/Flower10.png.meta
  66. 1 1
      Assets/Resources/Sprite/Garden/Flower11.png.meta
  67. 1 1
      Assets/Resources/Sprite/Garden/Flower12.png.meta
  68. 1 1
      Assets/Resources/Sprite/Garden/Flower13.png.meta
  69. 1 1
      Assets/Resources/Sprite/Garden/Flower14.png.meta
  70. 1 1
      Assets/Resources/Sprite/Garden/Flower15.png.meta
  71. 1 1
      Assets/Resources/Sprite/Garden/Flower16.png.meta
  72. 1 1
      Assets/Resources/Sprite/Garden/Flower17.png.meta
  73. 1 1
      Assets/Resources/Sprite/Garden/Flower18.png.meta
  74. 1 1
      Assets/Resources/Sprite/Garden/Flower19.png.meta
  75. 1 1
      Assets/Resources/Sprite/Garden/Flower2.png.meta
  76. 1 1
      Assets/Resources/Sprite/Garden/Flower20.png.meta
  77. 1 1
      Assets/Resources/Sprite/Garden/Flower21.png.meta
  78. 1 1
      Assets/Resources/Sprite/Garden/Flower22.png.meta
  79. 1 1
      Assets/Resources/Sprite/Garden/Flower23.png.meta
  80. 1 1
      Assets/Resources/Sprite/Garden/Flower24.png.meta
  81. 1 1
      Assets/Resources/Sprite/Garden/Flower25.png.meta
  82. 1 1
      Assets/Resources/Sprite/Garden/Flower26.png.meta
  83. 1 1
      Assets/Resources/Sprite/Garden/Flower27.png.meta
  84. 1 1
      Assets/Resources/Sprite/Garden/Flower3.png.meta
  85. 1 1
      Assets/Resources/Sprite/Garden/Flower4.png.meta
  86. 1 1
      Assets/Resources/Sprite/Garden/Flower5.png.meta
  87. 1 1
      Assets/Resources/Sprite/Garden/Flower6.png.meta
  88. 1 1
      Assets/Resources/Sprite/Garden/Flower7.png.meta
  89. 1 1
      Assets/Resources/Sprite/Garden/Flower8.png.meta
  90. 1 1
      Assets/Resources/Sprite/Garden/Flower9.png.meta
  91. 1 1
      Assets/Resources/Sprite/Garden/技能树1.png.meta
  92. 1 1
      Assets/Resources/Sprite/Garden/技能树2.png.meta
  93. 1 1
      Assets/Resources/Sprite/Garden/技能添加彩虹.png.meta
  94. 1 1
      Assets/Resources/Sprite/Garden/游戏背景.png.meta
  95. 1 1
      Assets/Resources/Sprite/Garden/花园1号.PNG.meta
  96. 1 1
      Assets/Resources/Sprite/Garden/花园2号.PNG.meta
  97. 1 1
      Assets/Resources/Sprite/Garden/花园3号.png.meta
  98. 1 1
      Assets/Resources/Sprite/Garden/花园4号.PNG.meta
  99. 1 1
      Assets/Resources/Sprite/Garden/花园5号.PNG.meta
  100. 1 1
      Assets/Resources/Sprite/Garden/花园云朵动画(提交一个其他根据参考缩小).PNG.meta

BIN
.vs/MyLovelyGarden/v14/.suo


+ 1 - 1
Assets/Resources/Font/SourceHanSansCN-Regular.otf.meta

@@ -17,5 +17,5 @@ TrueTypeFontImporter:
   fontRenderingMode: 0
   ascentCalculationMode: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

BIN
Assets/Resources/Garden.unity


BIN
Assets/Resources/Logo.unity


+ 1 - 1
Assets/Resources/Prefab/Object.meta

@@ -5,5 +5,5 @@ timeCreated: 1488453564
 licenseType: Pro
 DefaultImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/Object/Bird.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1490084251
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

BIN
Assets/Resources/Prefab/Object/Flower.prefab


+ 1 - 1
Assets/Resources/Prefab/Object/Flower.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489543807
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

BIN
Assets/Resources/Prefab/Object/Garden.prefab


+ 1 - 1
Assets/Resources/Prefab/Object/Garden.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486890531
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/Object/MainCamera.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486436342
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/Object/MusicMini.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489836991
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: object
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/Object/MusicTheme.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489836990
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: object
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/Object/Player.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486109166
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

BIN
Assets/Resources/Prefab/PrefabUI/Canvas.prefab


+ 1 - 1
Assets/Resources/Prefab/PrefabUI/Canvas.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486390835
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/PrefabUI/EventSystem.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486390844
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489664063
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489664004
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/PrefabUI/HudText.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1486192353
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

BIN
Assets/Resources/Prefab/PrefabUI/SignInItem.prefab


+ 1 - 1
Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489664166
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Prefab/PrefabUI/SkillItem.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1489663921
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Shader/Gray.shader.meta

@@ -5,5 +5,5 @@ licenseType: Pro
 ShaderImporter:
   defaultTextures: []
   userData: 
-  assetBundleName: 
+  assetBundleName: shader
   assetBundleVariant: 

BIN
Assets/Resources/Shader/GrayMat.mat


+ 1 - 1
Assets/Resources/Shader/Gray.mat.meta → Assets/Resources/Shader/GrayMat.mat.meta

@@ -4,5 +4,5 @@ timeCreated: 1489889916
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: shader
   assetBundleVariant: 

+ 105 - 0
Assets/Resources/Shader/HighLight.shader

@@ -0,0 +1,105 @@
+Shader "DashGame/HighLight"
+{
+	Properties
+	{
+		[PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {}
+		_Scale("Scale", float) = 0.02
+		[MaterialToggle] PixelSnap("Pixel snap", Float) = 0
+	}
+
+	SubShader
+	{
+		Tags
+		{
+			"Queue" = "Transparent"
+			"IgnoreProjector" = "True"
+			"RenderType" = "Transparent"
+			"PreviewType" = "Plane"
+			"CanUseSpriteAtlas" = "True"
+		}
+
+		Cull Off
+		Lighting Off
+		ZWrite Off
+
+		Pass
+		{
+			Blend SrcAlpha OneMinusSrcAlpha
+
+			CGPROGRAM
+				
+			#pragma vertex vert
+			#pragma fragment frag
+				
+			#pragma target 2.0
+				
+			#pragma multi_compile _ PIXELSNAP_ON
+			#pragma multi_compile _ ETC1_EXTERNAL_ALPHA
+				
+			#include "UnityCG.cginc"
+
+			struct appdata_t
+			{
+				float4 vertex   : POSITION;
+				float4 color    : COLOR;
+				float2 texcoord : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float4 vertex   : SV_POSITION;
+				float2 texcoord  : TEXCOORD0;
+			};
+
+			float _Scale;
+
+			v2f vert(appdata_t IN)
+			{
+				v2f OUT;
+
+				OUT.vertex = UnityObjectToClipPos(IN.vertex);
+				OUT.texcoord = IN.texcoord;
+
+				return OUT;
+			}
+
+			sampler2D _MainTex;
+
+			fixed4 SampleSpriteTexture(float2 uv)
+			{
+				fixed4 color = tex2D(_MainTex, uv);
+
+				return color;
+			}
+
+			fixed4 frag(v2f IN) : SV_Target
+			{
+				fixed4 c = SampleSpriteTexture(IN.texcoord);
+
+				if (c.a == 0) 
+				{
+					fixed4 c1 = SampleSpriteTexture(IN.texcoord + float2(_Scale, 0));
+					fixed4 c2 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, 0));
+					fixed4 c3 = SampleSpriteTexture(IN.texcoord + float2(0, _Scale));
+					fixed4 c4 = SampleSpriteTexture(IN.texcoord + float2(0, -_Scale));
+					fixed4 c5 = SampleSpriteTexture(IN.texcoord + float2(_Scale, _Scale));
+					fixed4 c6 = SampleSpriteTexture(IN.texcoord + float2(_Scale, -_Scale));
+					fixed4 c7 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, _Scale));
+					fixed4 c8 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, -_Scale));
+
+					if (c1.a > 0 || c2.a > 0 || c3.a > 0 || c4.a > 0 || c5.a > 0 || c6.a > 0 || c7.a > 0 || c8.a > 0)
+					{
+						c.rgba = 1;
+					}
+				}
+				else if (c.a < 1)
+				{
+					c.rgba = 1;
+				}
+
+				return c;
+			}
+			ENDCG
+		}
+	}
+}

+ 9 - 0
Assets/Resources/Shader/HighLight.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0328acfec1a1ba74cbfd90fb39cd5f70
+timeCreated: 1490605002
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: shader
+  assetBundleVariant: 

BIN
Assets/Resources/Shader/Gray.mat → Assets/Resources/Shader/HighLightMat.mat


+ 8 - 0
Assets/Resources/Shader/HighLightMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c1d308a23b4ae343b174be6509cc041
+timeCreated: 1490605040
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: shader
+  assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/上衣1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/上衣2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/上衣3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/右手你的右手!!.PNG.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/嘴巴1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/嘴巴2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/嘴巴3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/头饰品1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/头饰品2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/头饰品3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/左手看清左手你的左手!!.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 0 - 0
Assets/Resources/Sprite/Garden/技能黄鹂鸟.png → Assets/Resources/Sprite/Character/技能黄鹂鸟.png


+ 1 - 1
Assets/Resources/Sprite/Garden/技能黄鹂鸟.png.meta → Assets/Resources/Sprite/Character/技能黄鹂鸟.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/眼睛1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/眼睛2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/眼睛3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/脑壳1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/脑壳2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/脑壳3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/脖子.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/腿2个提供1个.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/裙子1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/裙子2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/裙子3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/鞋子1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/鞋子2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Character/鞋子3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 0 - 0
Assets/Resources/Sprite/Garden/音符1.png → Assets/Resources/Sprite/Character/音符1.png


+ 1 - 1
Assets/Resources/Sprite/Garden/音符1.png.meta → Assets/Resources/Sprite/Character/音符1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 0 - 0
Assets/Resources/Sprite/Garden/音符2.png → Assets/Resources/Sprite/Character/音符2.png


+ 1 - 1
Assets/Resources/Sprite/Garden/音符2.png.meta → Assets/Resources/Sprite/Character/音符2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 0 - 0
Assets/Resources/Sprite/Garden/音符3.png → Assets/Resources/Sprite/Character/音符3.png


+ 1 - 1
Assets/Resources/Sprite/Garden/音符3.png.meta → Assets/Resources/Sprite/Character/音符3.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: character
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower1.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower10.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower11.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower12.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower13.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower14.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower15.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower16.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower17.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower18.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower19.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower2.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower20.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower21.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower22.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower23.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower24.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower25.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower26.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower27.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower3.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower4.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower5.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower6.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower7.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower8.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/Flower9.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/技能树1.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/技能树2.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/技能添加彩虹.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/游戏背景.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园1号.PNG.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园2号.PNG.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园3号.png.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园4号.PNG.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园5号.PNG.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

+ 1 - 1
Assets/Resources/Sprite/Garden/花园云朵动画(提交一个其他根据参考缩小).PNG.meta

@@ -96,5 +96,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: garden
   assetBundleVariant: 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.