8 سال پیش · 09daa4da04
--- a/.vs/MyLovelyGarden/v14/.suo
+++ b/.vs/MyLovelyGarden/v14/.suo
--- a/Assets/Mobile/ICON
+++ b/Assets/Mobile/ICON
@@ -1,6 +1,6 @@
 
				 fileFormatVersion: 2
			
 
				 guid: a360cbb49a5d0cb49b8cc0a6e6210b75
			
 
				-timeCreated: 1491021444
			
 
				+timeCreated: 1491037646
			
 
				 licenseType: Pro
			
 
				 TextureImporter:
			
 
				   fileIDToRecycleName: {}
			
@@ -58,6 +58,38 @@ TextureImporter:
 
				     crunchedCompression: 0
			
 
				     allowsAlphaSplitting: 0
			
 
				     overridden: 0
			
 
				+  - buildTarget: Standalone
			
 
				+    maxTextureSize: 2048
			
 
				+    textureFormat: -1
			
 
				+    textureCompression: 1
			
 
				+    compressionQuality: 50
			
 
				+    crunchedCompression: 0
			
 
				+    allowsAlphaSplitting: 0
			
 
				+    overridden: 0
			
 
				+  - buildTarget: iPhone
			
 
				+    maxTextureSize: 2048
			
 
				+    textureFormat: -1
			
 
				+    textureCompression: 1
			
 
				+    compressionQuality: 50
			
 
				+    crunchedCompression: 0
			
 
				+    allowsAlphaSplitting: 0
			
 
				+    overridden: 0
			
 
				+  - buildTarget: Android
			
 
				+    maxTextureSize: 2048
			
 
				+    textureFormat: -1
			
 
				+    textureCompression: 1
			
 
				+    compressionQuality: 50
			
 
				+    crunchedCompression: 0
			
 
				+    allowsAlphaSplitting: 0
			
 
				+    overridden: 0
			
 
				+  - buildTarget: WebGL
			
 
				+    maxTextureSize: 2048
			
 
				+    textureFormat: -1
			
 
				+    textureCompression: 1
			
 
				+    compressionQuality: 50
			
 
				+    crunchedCompression: 0
			
 
				+    allowsAlphaSplitting: 0
			
 
				+    overridden: 0
			
 
				   spriteSheet:
			
 
				     serializedVersion: 2
			
 
				     sprites: []
			
--- a/Assets/Resource.meta
+++ b/Assets/Resource.meta
@@ -0,0 +1,9 @@
 
				+fileFormatVersion: 2
			
 
				+guid: 7f75152639ecd5847ace7af070a0ee95
			
 
				+folderAsset: yes
			
 
				+timeCreated: 1488200471
			
 
				+licenseType: Pro
			
 
				+DefaultImporter:
			
 
				+  userData: 
			
 
				+  assetBundleName: 
			
 
				+  assetBundleVariant: 
			
--- a/Assets/Resources/Animations.meta
+++ b/Assets/Resources/Animations.meta
--- a/Assets/Resources/Animations/Bird.controller
+++ b/Assets/Resources/Animations/Bird.controller
--- a/Assets/Resources/Animations/Bird.controller.meta
+++ b/Assets/Resources/Animations/Bird.controller.meta
--- a/Assets/Resources/Animations/BirdSing.anim
+++ b/Assets/Resources/Animations/BirdSing.anim
--- a/Assets/Resources/Animations/BirdSing.anim.meta
+++ b/Assets/Resources/Animations/BirdSing.anim.meta
--- a/Assets/Resources/Animations/Elf.controller
+++ b/Assets/Resources/Animations/Elf.controller
--- a/Assets/Resources/Animations/Elf.controller.meta
+++ b/Assets/Resources/Animations/Elf.controller.meta
--- a/Assets/Resource/Animations/ElfFly.anim
+++ b/Assets/Resource/Animations/ElfFly.anim
--- a/Assets/Resource/Animations/ElfFly.anim.meta
+++ b/Assets/Resource/Animations/ElfFly.anim.meta
@@ -0,0 +1,8 @@
 
				+fileFormatVersion: 2
			
 
				+guid: 1d59bb6e5f588094fbe0a5ec773d3fc6
			
 
				+timeCreated: 1491022339
			
 
				+licenseType: Pro
			
 
				+NativeFormatImporter:
			
 
				+  userData: 
			
 
				+  assetBundleName: 
			
 
				+  assetBundleVariant: 
			
--- a/Assets/Resources/Animations/FlashLight.anim
+++ b/Assets/Resources/Animations/FlashLight.anim
--- a/Assets/Resources/Animations/FlashLight.anim.meta
+++ b/Assets/Resources/Animations/FlashLight.anim.meta
--- a/Assets/Resources/Animations/FlashLight.controller
+++ b/Assets/Resources/Animations/FlashLight.controller
--- a/Assets/Resources/Animations/FlashLight.controller.meta
+++ b/Assets/Resources/Animations/FlashLight.controller.meta
--- a/Assets/Resources/Animations/Flower.anim
+++ b/Assets/Resources/Animations/Flower.anim
--- a/Assets/Resources/Animations/Flower.anim.meta
+++ b/Assets/Resources/Animations/Flower.anim.meta
--- a/Assets/Resources/Animations/Flower.controller
+++ b/Assets/Resources/Animations/Flower.controller
--- a/Assets/Resources/Animations/Flower.controller.meta
+++ b/Assets/Resources/Animations/Flower.controller.meta
--- a/Assets/Resource/Animations/FlowerItemG.controller
+++ b/Assets/Resource/Animations/FlowerItemG.controller
--- a/Assets/Resource/Animations/FlowerItemG.controller.meta
+++ b/Assets/Resource/Animations/FlowerItemG.controller.meta
@@ -0,0 +1,8 @@
 
				+fileFormatVersion: 2
			
 
				+guid: 58c3cadb02dbc774ca98afda8ed7b494
			
 
				+timeCreated: 1491010681
			
 
				+licenseType: Pro
			
 
				+NativeFormatImporter:
			
 
				+  userData: 
			
 
				+  assetBundleName: 
			
 
				+  assetBundleVariant: 
			
--- a/Assets/Resources/Animations/LOGO0005.controller
+++ b/Assets/Resources/Animations/LOGO0005.controller
--- a/Assets/Resources/Animations/LOGO0005.controller.meta
+++ b/Assets/Resources/Animations/LOGO0005.controller.meta
--- a/Assets/Resources/Animations/Logo.anim
+++ b/Assets/Resources/Animations/Logo.anim
--- a/Assets/Resources/Animations/Logo.anim.meta
+++ b/Assets/Resources/Animations/Logo.anim.meta
--- a/Assets/Resources/Animations/Rotate.controller
+++ b/Assets/Resources/Animations/Rotate.controller
--- a/Assets/Resources/Animations/Rotate.controller.meta
+++ b/Assets/Resources/Animations/Rotate.controller.meta
--- a/Assets/Resources/Animations/rotate.anim
+++ b/Assets/Resources/Animations/rotate.anim
--- a/Assets/Resources/Animations/rotate.anim.meta
+++ b/Assets/Resources/Animations/rotate.anim.meta
--- a/Assets/Resources/Audio.meta
+++ b/Assets/Resources/Audio.meta
--- a/Assets/Resources/Audio/8LOGO音效.mp3
+++ b/Assets/Resources/Audio/8LOGO音效.mp3
--- a/Assets/Resources/Audio/8LOGO音效.mp3.meta
+++ b/Assets/Resources/Audio/8LOGO音效.mp3.meta
--- a/Assets/Resources/Audio/mini_game_bg.mp3
+++ b/Assets/Resources/Audio/mini_game_bg.mp3
--- a/Assets/Resources/Audio/mini_game_bg.mp3.meta
+++ b/Assets/Resources/Audio/mini_game_bg.mp3.meta
--- a/Assets/Resources/Audio/theme_bg.mp3
+++ b/Assets/Resources/Audio/theme_bg.mp3
--- a/Assets/Resources/Audio/theme_bg.mp3.meta
+++ b/Assets/Resources/Audio/theme_bg.mp3.meta
--- a/Assets/Resources/Font.meta
+++ b/Assets/Resources/Font.meta
--- a/Assets/Resources/Font/SourceHanSansCN-Regular.otf
+++ b/Assets/Resources/Font/SourceHanSansCN-Regular.otf
--- a/Assets/Resources/Font/SourceHanSansCN-Regular.otf.meta
+++ b/Assets/Resources/Font/SourceHanSansCN-Regular.otf.meta
--- a/Assets/Resources/Garden.unity
+++ b/Assets/Resources/Garden.unity
--- a/Assets/Resources/Garden.unity.meta
+++ b/Assets/Resources/Garden.unity.meta
--- a/Assets/Resources/Logo.unity
+++ b/Assets/Resources/Logo.unity
--- a/Assets/Resources/Logo.unity.meta
+++ b/Assets/Resources/Logo.unity.meta
--- a/Assets/Resources/Plugins.meta
+++ b/Assets/Resources/Plugins.meta
--- a/Assets/Resources/Plugins/Debuger.dll
+++ b/Assets/Resources/Plugins/Debuger.dll
--- a/Assets/Resources/Plugins/Debuger.dll.meta
+++ b/Assets/Resources/Plugins/Debuger.dll.meta
--- a/Assets/Resources/Plugins/LitJson.dll
+++ b/Assets/Resources/Plugins/LitJson.dll
--- a/Assets/Resources/Plugins/LitJson.dll.meta
+++ b/Assets/Resources/Plugins/LitJson.dll.meta
--- a/Assets/Resources/Plugins/Xlsx.meta
+++ b/Assets/Resources/Plugins/Xlsx.meta
--- a/Assets/Resources/Plugins/Xlsx/Excel.dll
+++ b/Assets/Resources/Plugins/Xlsx/Excel.dll
--- a/Assets/Resources/Plugins/Xlsx/Excel.dll.meta
+++ b/Assets/Resources/Plugins/Xlsx/Excel.dll.meta
--- a/Assets/Resources/Plugins/Xlsx/ICSharpCode.SharpZipLib.dll
+++ b/Assets/Resources/Plugins/Xlsx/ICSharpCode.SharpZipLib.dll
--- a/Assets/Resources/Plugins/Xlsx/ICSharpCode.SharpZipLib.dll.meta
+++ b/Assets/Resources/Plugins/Xlsx/ICSharpCode.SharpZipLib.dll.meta
--- a/Assets/Resources/Plugins/Xlsx/System.Data.dll
+++ b/Assets/Resources/Plugins/Xlsx/System.Data.dll
--- a/Assets/Resources/Plugins/Xlsx/System.Data.dll.meta
+++ b/Assets/Resources/Plugins/Xlsx/System.Data.dll.meta
--- a/Assets/Resources/Prefab.meta
+++ b/Assets/Resources/Prefab.meta
--- a/Assets/Resources/Prefab/Object.meta
+++ b/Assets/Resources/Prefab/Object.meta
--- a/Assets/Resources/Prefab/Object/Bird.prefab
+++ b/Assets/Resources/Prefab/Object/Bird.prefab
--- a/Assets/Resources/Prefab/Object/Bird.prefab.meta
+++ b/Assets/Resources/Prefab/Object/Bird.prefab.meta
--- a/Assets/Resources/Prefab/Object/DropDiamond.prefab
+++ b/Assets/Resources/Prefab/Object/DropDiamond.prefab
--- a/Assets/Resources/Prefab/Object/DropDiamond.prefab.meta
+++ b/Assets/Resources/Prefab/Object/DropDiamond.prefab.meta
--- a/Assets/Resources/Prefab/Object/DropGold.prefab
+++ b/Assets/Resources/Prefab/Object/DropGold.prefab
--- a/Assets/Resources/Prefab/Object/DropGold.prefab.meta
+++ b/Assets/Resources/Prefab/Object/DropGold.prefab.meta
--- a/Assets/Resources/Prefab/Object/FlashLight.prefab
+++ b/Assets/Resources/Prefab/Object/FlashLight.prefab
--- a/Assets/Resources/Prefab/Object/FlashLight.prefab.meta
+++ b/Assets/Resources/Prefab/Object/FlashLight.prefab.meta
--- a/Assets/Resources/Prefab/Object/Flower.prefab
+++ b/Assets/Resources/Prefab/Object/Flower.prefab
--- a/Assets/Resources/Prefab/Object/Flower.prefab.meta
+++ b/Assets/Resources/Prefab/Object/Flower.prefab.meta
--- a/Assets/Resources/Prefab/Object/Garden.prefab
+++ b/Assets/Resources/Prefab/Object/Garden.prefab
--- a/Assets/Resources/Prefab/Object/Garden.prefab.meta
+++ b/Assets/Resources/Prefab/Object/Garden.prefab.meta
--- a/Assets/Resources/Prefab/Object/MainCamera.prefab
+++ b/Assets/Resources/Prefab/Object/MainCamera.prefab
--- a/Assets/Resources/Prefab/Object/MainCamera.prefab.meta
+++ b/Assets/Resources/Prefab/Object/MainCamera.prefab.meta
--- a/Assets/Resources/Prefab/Object/MusicMini.prefab
+++ b/Assets/Resources/Prefab/Object/MusicMini.prefab
--- a/Assets/Resources/Prefab/Object/MusicMini.prefab.meta
+++ b/Assets/Resources/Prefab/Object/MusicMini.prefab.meta
--- a/Assets/Resources/Prefab/Object/MusicTheme.prefab
+++ b/Assets/Resources/Prefab/Object/MusicTheme.prefab
--- a/Assets/Resources/Prefab/Object/MusicTheme.prefab.meta
+++ b/Assets/Resources/Prefab/Object/MusicTheme.prefab.meta
--- a/Assets/Resources/Prefab/Object/Player.prefab
+++ b/Assets/Resources/Prefab/Object/Player.prefab
--- a/Assets/Resources/Prefab/Object/Player.prefab.meta
+++ b/Assets/Resources/Prefab/Object/Player.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI.meta
+++ b/Assets/Resources/Prefab/PrefabUI.meta
--- a/Assets/Resources/Prefab/PrefabUI/Canvas.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/Canvas.prefab
--- a/Assets/Resources/Prefab/PrefabUI/Canvas.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/Canvas.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/EventSystem.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/EventSystem.prefab
--- a/Assets/Resources/Prefab/PrefabUI/EventSystem.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/EventSystem.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab
--- a/Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/FlowerItemG.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab
--- a/Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/FlowerItemH.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/HudText.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/HudText.prefab
--- a/Assets/Resources/Prefab/PrefabUI/HudText.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/HudText.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/SignInItem.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/SignInItem.prefab
--- a/Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/SignInItem.prefab.meta
--- a/Assets/Resources/Prefab/PrefabUI/SkillItem.prefab
+++ b/Assets/Resources/Prefab/PrefabUI/SkillItem.prefab
--- a/Assets/Resources/Prefab/PrefabUI/SkillItem.prefab.meta
+++ b/Assets/Resources/Prefab/PrefabUI/SkillItem.prefab.meta
--- a/Assets/Resources/Shader.meta
+++ b/Assets/Resources/Shader.meta
--- a/Assets/Resources/Shader/Gray.shader
+++ b/Assets/Resources/Shader/Gray.shader
--- a/Assets/Resources/Shader/Gray.shader.meta
+++ b/Assets/Resources/Shader/Gray.shader.meta
--- a/Assets/Resources/Shader/GrayMat.mat
+++ b/Assets/Resources/Shader/GrayMat.mat
--- a/Assets/Resources/Shader/GrayMat.mat.meta
+++ b/Assets/Resources/Shader/GrayMat.mat.meta
--- a/Assets/Resources/Shader/HighLight.shader
+++ b/Assets/Resources/Shader/HighLight.shader
--- a/Assets/Resources/Shader/HighLight.shader.meta
+++ b/Assets/Resources/Shader/HighLight.shader.meta