LiuQilin il y a 8 ans
Parent
commit
45882a51dc
40 fichiers modifiés avec 151 ajouts et 187 suppressions
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. 0 9
      Assets/Extension.meta
  3. 3 3
      Assets/Plugins/Android/ShareSDK/AndroidManifest.xml
  4. 1 1
      Assets/Plugins/UnityPurchasing.meta
  5. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar
  6. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar
  7. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar
  8. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar
  9. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar
  10. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/common.aar
  11. BIN
      Assets/Plugins/UnityPurchasing/Bin/Apple/Apple.dll
  12. BIN
      Assets/Plugins/UnityPurchasing/Bin/Apple/live/Apple.dll
  13. BIN
      Assets/Plugins/UnityPurchasing/Bin/Editor.dll
  14. BIN
      Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll
  15. BIN
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll
  16. BIN
      Assets/Plugins/UnityPurchasing/Bin/Purchasing.Common.dll
  17. BIN
      Assets/Plugins/UnityPurchasing/Bin/Security.dll
  18. BIN
      Assets/Plugins/UnityPurchasing/Bin/Stores.dll
  19. BIN
      Assets/Plugins/UnityPurchasing/Bin/Tizen/Tizen.dll
  20. BIN
      Assets/Plugins/UnityPurchasing/Bin/Tizen/live/Tizen.dll
  21. BIN
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS/unitypurchasing
  22. 4 0
      Assets/Plugins/UnityPurchasing/Changelog.md
  23. 1 1
      Assets/Plugins/UnityPurchasing/ETag
  24. 1 1
      Assets/Plugins/UnityPurchasing/Editor.meta
  25. 11 52
      Assets/Plugins/UnityPurchasing/Icons/UnityEngine.Purchasing.IAPButtonIcon.png.meta
  26. 0 2
      Assets/Plugins/UnityPurchasing/iOS.meta
  27. BIN
      Assets/Resource/Logo.unity
  28. 74 74
      Assets/Resource/XML/Config/achieve_config.xml
  29. 3 3
      Assets/Resource/XML/PlayerConfig.xml
  30. 3 3
      Assets/Resource/XML/lan/ChineseSimplified.xml
  31. 3 3
      Assets/Resource/XML/lan/ChineseTraditional.xml
  32. 3 3
      Assets/Resource/XML/lan/English.xml
  33. 5 4
      Assets/Script/Manage/ManaCenter.cs
  34. 3 3
      Assets/Script/Manage/ManaIAP.cs
  35. 2 0
      Assets/Script/Manage/ManaTutorial.cs
  36. 3 0
      Assets/Script/Object/Skill/Ability.cs
  37. 1 1
      Assets/Script/Object/Skill/Skill.cs
  38. 1 1
      Assets/Script/Tool/DashGame/Logo.cs
  39. 26 23
      MyLovelyGarden.sln
  40. 3 0
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


+ 0 - 9
Assets/Extension.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
-folderAsset: yes
-timeCreated: 1496150477
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 3 - 3
Assets/Plugins/Android/ShareSDK/AndroidManifest.xml

@@ -8,10 +8,10 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
+    <!--<uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
     <!--<uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>-->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <!--<uses-permission android:name="android.permission.GET_ACCOUNTS"/>-->
     <!-- 蓝牙分享所需的权限 -->
     <!--<uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

+ 1 - 1
Assets/Plugins/UnityPurchasing.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: 2628f297056214eb5bfc03285c5c8e77
 folderAsset: yes
 timeCreated: 1437430165
-licenseType: Store
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Android/common.aar


BIN
Assets/Plugins/UnityPurchasing/Bin/Apple/Apple.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Apple/live/Apple.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Editor.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Purchasing.Common.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Security.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Stores.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Tizen/Tizen.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Tizen/live/Tizen.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS/unitypurchasing


+ 4 - 0
Assets/Plugins/UnityPurchasing/Changelog.md

@@ -1,3 +1,7 @@
+## [1.11.1] - 2017-05-23
+### Fixed
+- GooglePlay - Fix regression seen during purchasing where GooglePlay Activity forces screen orientation to portrait and turns background black. Restores neutral orientation and transparent background behavior.
+
 ## [1.11.0] - 2017-05-01
 ### Added
 - FacebookStore - Facebook Gameroom Payments Lite support. Available on Unity 5.6+ when building for Facebook Platform on Gameroom (Windows) and WebGL. Preliminary documentation is available [here](https://docs.google.com/document/d/1FaYwKvdnMHxkh47YVuXx9dMbc6ZtLX53mtgyAIn6WfU/)

+ 1 - 1
Assets/Plugins/UnityPurchasing/ETag

@@ -1 +1 @@
-"759c4f9870edfe53cb66f37a4d2078c4"
+"61cb55362fb219b87ca4fec7f729d99b"

+ 1 - 1
Assets/Plugins/UnityPurchasing/Editor.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: beabab81fac9c4cfeb330a7a850aeccc
 folderAsset: yes
 timeCreated: 1456232042
-licenseType: Store
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

+ 11 - 52
Assets/Plugins/UnityPurchasing/Icons/UnityEngine.Purchasing.IAPButtonIcon.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 55e457740fe60405dac77af143e1a867
-timeCreated: 1496327056
-licenseType: Pro
+timeCreated: 1479509804
+licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 4
+  serializedVersion: 2
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
     linearTexture: 0
+    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,8 +21,10 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 6
+  generateCubemap: 0
   cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 2048
@@ -33,7 +35,9 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
+  rGBM: 0
   compressionQuality: 50
+  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -41,55 +45,10 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
-  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    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
+  textureType: -1
+  buildTargetSettings: []
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 0 - 2
Assets/Plugins/UnityPurchasing/iOS.meta

@@ -3,5 +3,3 @@ guid: b722e2504dd3140409a9beb9c8d1b6b6
 folderAsset: yes
 DefaultImporter:
   userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Resource/Logo.unity


+ 74 - 74
Assets/Resource/XML/Config/achieve_config.xml

@@ -1,78 +1,78 @@
 <data>
-  <item id="1" index="1" name="美丽花园-1" desc="花园等级达到 30" type="1" value="15" parent="" del="1" diamond_once="10" coin_person="" person="" icon="红-公园" />
-  <item id="2" index="1" name="美丽花园-2" desc="花园等级达到 50" type="1" value="30" parent="1" del="1" diamond_once="15" coin_person="" person="" icon="红-公园" />
-  <item id="3" index="1" name="美丽花园-3" desc="花园等级达到 100" type="1" value="50" parent="2" del="1" diamond_once="20" coin_person="" person="" icon="红-公园" />
-  <item id="4" index="1" name="美丽花园-4" desc="花园等级达到 200" type="1" value="100" parent="3" del="1" diamond_once="30" coin_person="" person="" icon="红-公园" />
-  <item id="5" index="1" name="美丽花园-5" desc="花园等级达到 300" type="1" value="200" parent="4" del="1" diamond_once="40" coin_person="" person="" icon="红-公园" />
-  <item id="6" index="1" name="美丽花园-6" desc="花园等级达到 400" type="1" value="300" parent="5" del="0" diamond_once="50" coin_person="" person="" icon="红-公园" />
-  <item id="21" index="2" name="鼓鼓的钱包-1" desc="拥有1000金币" type="2" value="3000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="绿-免费金币" />
-  <item id="22" index="2" name="鼓鼓的钱包-2" desc="拥有2000金币" type="2" value="5000" parent="21" del="1" diamond_once="10" coin_person="" person="" icon="绿-免费金币" />
-  <item id="23" index="2" name="鼓鼓的钱包-3" desc="拥有3000金币" type="2" value="10000" parent="22" del="1" diamond_once="15" coin_person="" person="" icon="绿-免费金币" />
-  <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="50000" parent="23" del="1" diamond_once="20" coin_person="" person="" icon="绿-免费金币" />
-  <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="150000" parent="24" del="1" diamond_once="30" coin_person="" person="" icon="绿-免费金币" />
-  <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="450000" parent="25" del="0" diamond_once="40" coin_person="" person="" icon="绿-免费金币" />
-  <item id="41" index="3" name="精明的商人-1" desc="总共获取3000金币" type="3" value="10000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="4大技能2" />
-  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="100000" parent="41" del="1" diamond_once="10" coin_person="" person="" icon="4大技能2" />
-  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="250000" parent="42" del="1" diamond_once="15" coin_person="" person="" icon="4大技能2" />
-  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="800000" parent="43" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
-  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="2000000" parent="44" del="1" diamond_once="30" coin_person="" person="" icon="4大技能2" />
-  <item id="46" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="5000000" parent="45" del="0" diamond_once="40" coin_person="" person="" icon="4大技能2" />
-  <item id="61" index="4" name="花仙子-1" desc="所有精灵等级总和达到10级" type="4" value="10" parent="" del="1" diamond_once="10" coin_person="" person="" icon="蓝-高级包" />
-  <item id="62" index="4" name="花仙子-2" desc="所有精灵等级总和达到50级" type="4" value="30" parent="61" del="1" diamond_once="15" coin_person="" person="" icon="蓝-高级包" />
-  <item id="63" index="4" name="花仙子-3" desc="所有精灵等级总和达到100级" type="4" value="50" parent="62" del="1" diamond_once="20" coin_person="" person="" icon="蓝-高级包" />
-  <item id="64" index="4" name="花仙子-4" desc="所有精灵等级总和达到180级" type="4" value="100" parent="63" del="1" diamond_once="30" coin_person="" person="" icon="蓝-高级包" />
-  <item id="65" index="4" name="花仙子-5" desc="所有精灵等级总和达到400级" type="4" value="150" parent="64" del="1" diamond_once="40" coin_person="" person="" icon="蓝-高级包" />
-  <item id="66" index="4" name="花仙子-6" desc="所有精灵等级总和达到800级" type="4" value="300" parent="65" del="0" diamond_once="50" coin_person="" person="" icon="蓝-高级包" />
-  <item id="81" index="5" name="百花争艳-1" desc="花朵数量达到1" type="5" value="1" parent="" del="1" diamond_once="5" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="82" index="5" name="百花争艳-2" desc="花朵数量达到3" type="5" value="3" parent="81" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="83" index="5" name="百花争艳-3" desc="花朵数量达到5" type="5" value="5" parent="82" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="84" index="5" name="百花争艳-4" desc="花朵数量达到10" type="5" value="10" parent="83" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="85" index="5" name="百花争艳-5" desc="花朵数量达到20" type="5" value="20" parent="84" del="1" diamond_once="30" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="86" index="5" name="百花争艳-6" desc="花朵数量达到40" type="5" value="40" parent="85" del="0" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
-  <item id="101" index="6" name="人山人海-1" desc="参观人次总数达到500" type="6" value="1000" parent="" del="1" diamond_once="5" coin_person="" person="" icon="4大技能1" />
-  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="10000" parent="101" del="1" diamond_once="10" coin_person="" person="" icon="4大技能1" />
-  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="50000" parent="102" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
-  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="150000" parent="103" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
-  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="300000" parent="104" del="1" diamond_once="30" coin_person="" person="" icon="4大技能1" />
-  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="800000" parent="105" del="0" diamond_once="40" coin_person="" person="" icon="4大技能1" />
-  <item id="121" index="7" name="技能大师-1" desc="使用技能5次" type="7" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="122" index="7" name="技能大师-2" desc="使用技能10次" type="7" value="30" parent="121" del="1" diamond_once="15" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="123" index="7" name="技能大师-3" desc="使用技能20次" type="7" value="80" parent="122" del="1" diamond_once="20" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="124" index="7" name="技能大师-4" desc="使用技能50次" type="7" value="200" parent="123" del="1" diamond_once="30" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="125" index="7" name="技能大师-5" desc="使用技能150次" type="7" value="350" parent="124" del="1" diamond_once="40" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="126" index="7" name="技能大师-6" desc="使用技能250次" type="7" value="500" parent="125" del="0" diamond_once="50" coin_person="" person="" icon="红-黄鹂鸟" />
-  <item id="141" index="8" name="鉴赏大师-1" desc="观看2次广告" type="8" value="2" parent="" del="1" diamond_once="10" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="142" index="8" name="鉴赏大师-2" desc="观看5次广告" type="8" value="5" parent="141" del="1" diamond_once="15" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="143" index="8" name="鉴赏大师-3" desc="观看10次广告" type="8" value="10" parent="142" del="1" diamond_once="20" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="144" index="8" name="鉴赏大师-4" desc="观看15次广告" type="8" value="45" parent="143" del="1" diamond_once="30" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="145" index="8" name="鉴赏大师-5" desc="观看25次广告" type="8" value="100" parent="144" del="1" diamond_once="40" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="146" index="8" name="鉴赏大师-6" desc="观看40次广告" type="8" value="180" parent="145" del="0" diamond_once="50" coin_person="" person="" icon="蓝-免费钻" />
-  <item id="161" index="9" name="按时打卡-1" desc="签到5次" type="9" value="5" parent="" del="1" diamond_once="5" coin_person="" person="" icon="红-彩虹" />
-  <item id="162" index="9" name="按时打卡-2" desc="签到10次" type="9" value="10" parent="161" del="1" diamond_once="10" coin_person="" person="" icon="红-彩虹" />
-  <item id="163" index="9" name="按时打卡-3" desc="签到15次" type="9" value="25" parent="162" del="1" diamond_once="15" coin_person="" person="" icon="红-彩虹" />
-  <item id="164" index="9" name="按时打卡-4" desc="签到25次" type="9" value="50" parent="163" del="1" diamond_once="20" coin_person="" person="" icon="红-彩虹" />
-  <item id="165" index="9" name="按时打卡-5" desc="签到35次" type="9" value="85" parent="164" del="1" diamond_once="30" coin_person="" person="" icon="红-彩虹" />
-  <item id="166" index="9" name="按时打卡-6" desc="签到50次" type="9" value="150" parent="165" del="0" diamond_once="40" coin_person="" person="" icon="红-彩虹" />
-  <item id="181" index="10" name="乐于分享-1" desc="分享1次" type="10" value="1" parent="" del="1" diamond_once="5" coin_person="" person="" icon="红-樱花树" />
-  <item id="182" index="10" name="乐于分享-2" desc="分享5次" type="10" value="5" parent="181" del="1" diamond_once="10" coin_person="" person="" icon="红-樱花树" />
-  <item id="183" index="10" name="乐于分享-3" desc="分享10次" type="10" value="10" parent="182" del="1" diamond_once="15" coin_person="" person="" icon="红-樱花树" />
-  <item id="184" index="10" name="乐于分享-4" desc="分享15次" type="10" value="15" parent="183" del="1" diamond_once="20" coin_person="" person="" icon="红-樱花树" />
-  <item id="185" index="10" name="乐于分享-5" desc="分享25次" type="10" value="25" parent="184" del="1" diamond_once="30" coin_person="" person="" icon="红-樱花树" />
-  <item id="186" index="10" name="乐于分享-6" desc="分享40次" type="10" value="40" parent="185" del="1" diamond_once="40" coin_person="" person="" icon="红-樱花树" />
-  <item id="187" index="10" name="乐于分享-7" desc="" type="10" value="80" parent="186" del="1" diamond_once="55" coin_person="" person="" icon="红-樱花树" />
-  <item id="188" index="10" name="乐于分享-8" desc="" type="10" value="120" parent="187" del="0" diamond_once="70" coin_person="" person="" icon="红-樱花树" />
-  <item id="201" index="11" name="辛勤的花匠-1" desc="完成小游戏5次" type="11" value="5" parent="" del="1" diamond_once="5" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="202" index="11" name="辛勤的花匠-2" desc="完成小游戏10次" type="11" value="10" parent="201" del="1" diamond_once="10" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="203" index="11" name="辛勤的花匠-3" desc="完成小游戏30次" type="11" value="50" parent="202" del="1" diamond_once="15" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="204" index="11" name="辛勤的花匠-4" desc="完成小游戏50次" type="11" value="100" parent="203" del="1" diamond_once="20" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="205" index="11" name="辛勤的花匠-5" desc="完成小游戏100次" type="11" value="200" parent="204" del="1" diamond_once="30" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="206" index="11" name="辛勤的花匠-6" desc="完成小游戏200次" type="11" value="500" parent="205" del="0" diamond_once="40" coin_person="" person="" icon="黄-黄色蜜蜂" />
-  <item id="221" index="12" name="积少成多-1" desc="收集花园里的金币50次" type="12" value="50" parent="" del="1" diamond_once="5" coin_person="" person="" icon="绿-金币包3" />
-  <item id="222" index="12" name="积少成多-2" desc="收集花园里的金币100次" type="12" value="100" parent="221" del="1" diamond_once="10" coin_person="" person="" icon="绿-金币包3" />
-  <item id="223" index="12" name="积少成多-3" desc="收集花园里的金币300次" type="12" value="450" parent="222" del="1" diamond_once="15" coin_person="" person="" icon="绿-金币包3" />
-  <item id="224" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="1000" parent="223" del="1" diamond_once="20" coin_person="" person="" icon="绿-金币包3" />
-  <item id="225" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="2000" parent="224" del="1" diamond_once="30" coin_person="" person="" icon="绿-金币包3" />
-  <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="3500" parent="225" del="0" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
+  <item id="1" index="1" name="美丽花园-1" desc="花园等级达到 30" type="1" value="15" parent="" del="1" diamond_once="15" coin_person="" person="" icon="红-公园" />
+  <item id="2" index="1" name="美丽花园-2" desc="花园等级达到 50" type="1" value="30" parent="1" del="1" diamond_once="20" coin_person="" person="" icon="红-公园" />
+  <item id="3" index="1" name="美丽花园-3" desc="花园等级达到 100" type="1" value="50" parent="2" del="1" diamond_once="35" coin_person="" person="" icon="红-公园" />
+  <item id="4" index="1" name="美丽花园-4" desc="花园等级达到 200" type="1" value="100" parent="3" del="1" diamond_once="50" coin_person="" person="" icon="红-公园" />
+  <item id="5" index="1" name="美丽花园-5" desc="花园等级达到 300" type="1" value="200" parent="4" del="1" diamond_once="65" coin_person="" person="" icon="红-公园" />
+  <item id="6" index="1" name="美丽花园-6" desc="花园等级达到 400" type="1" value="300" parent="5" del="0" diamond_once="80" coin_person="" person="" icon="红-公园" />
+  <item id="21" index="2" name="鼓鼓的钱包-1" desc="拥有1000金币" type="2" value="3000" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-免费金币" />
+  <item id="22" index="2" name="鼓鼓的钱包-2" desc="拥有2000金币" type="2" value="10000" parent="21" del="1" diamond_once="15" coin_person="" person="" icon="绿-免费金币" />
+  <item id="23" index="2" name="鼓鼓的钱包-3" desc="拥有3000金币" type="2" value="50000" parent="22" del="1" diamond_once="20" coin_person="" person="" icon="绿-免费金币" />
+  <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="150000" parent="23" del="1" diamond_once="25" coin_person="" person="" icon="绿-免费金币" />
+  <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="450000" parent="24" del="1" diamond_once="40" coin_person="" person="" icon="绿-免费金币" />
+  <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="1000000" parent="25" del="0" diamond_once="50" coin_person="" person="" icon="绿-免费金币" />
+  <item id="41" index="3" name="精明的商人-1" desc="总共获取3000金币" type="3" value="10000" parent="" del="1" diamond_once="15" coin_person="" person="" icon="4大技能2" />
+  <item id="42" index="3" name="精明的商人-2" desc="总共获取8000金币" type="3" value="100000" parent="41" del="1" diamond_once="20" coin_person="" person="" icon="4大技能2" />
+  <item id="43" index="3" name="精明的商人-3" desc="总共获取15000金币" type="3" value="500000" parent="42" del="1" diamond_once="35" coin_person="" person="" icon="4大技能2" />
+  <item id="44" index="3" name="精明的商人-4" desc="总共获取30000金币" type="3" value="2000000" parent="43" del="1" diamond_once="50" coin_person="" person="" icon="4大技能2" />
+  <item id="45" index="3" name="精明的商人-5" desc="总共获取50000金币" type="3" value="5000000" parent="44" del="1" diamond_once="65" coin_person="" person="" icon="4大技能2" />
+  <item id="46" index="3" name="精明的商人-6" desc="总共获取80000金币" type="3" value="10000000" parent="45" del="0" diamond_once="80" coin_person="" person="" icon="4大技能2" />
+  <item id="61" index="4" name="花仙子-1" desc="所有精灵等级总和达到10级" type="4" value="10" parent="" del="1" diamond_once="15" coin_person="" person="" icon="蓝-高级包" />
+  <item id="62" index="4" name="花仙子-2" desc="所有精灵等级总和达到50级" type="4" value="30" parent="61" del="1" diamond_once="20" coin_person="" person="" icon="蓝-高级包" />
+  <item id="63" index="4" name="花仙子-3" desc="所有精灵等级总和达到100级" type="4" value="50" parent="62" del="1" diamond_once="35" coin_person="" person="" icon="蓝-高级包" />
+  <item id="64" index="4" name="花仙子-4" desc="所有精灵等级总和达到180级" type="4" value="100" parent="63" del="1" diamond_once="50" coin_person="" person="" icon="蓝-高级包" />
+  <item id="65" index="4" name="花仙子-5" desc="所有精灵等级总和达到400级" type="4" value="150" parent="64" del="1" diamond_once="65" coin_person="" person="" icon="蓝-高级包" />
+  <item id="66" index="4" name="花仙子-6" desc="所有精灵等级总和达到800级" type="4" value="300" parent="65" del="0" diamond_once="80" coin_person="" person="" icon="蓝-高级包" />
+  <item id="81" index="5" name="百花争艳-1" desc="花朵数量达到1" type="5" value="1" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="82" index="5" name="百花争艳-2" desc="花朵数量达到3" type="5" value="3" parent="81" del="1" diamond_once="15" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="83" index="5" name="百花争艳-3" desc="花朵数量达到5" type="5" value="5" parent="82" del="1" diamond_once="20" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="84" index="5" name="百花争艳-4" desc="花朵数量达到10" type="5" value="10" parent="83" del="1" diamond_once="25" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="85" index="5" name="百花争艳-5" desc="花朵数量达到20" type="5" value="20" parent="84" del="1" diamond_once="40" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="86" index="5" name="百花争艳-6" desc="花朵数量达到40" type="5" value="40" parent="85" del="0" diamond_once="50" coin_person="" person="" icon="绿-繁花似锦" />
+  <item id="101" index="6" name="人山人海-1" desc="参观人次总数达到500" type="6" value="1000" parent="" del="1" diamond_once="10" coin_person="" person="" icon="4大技能1" />
+  <item id="102" index="6" name="人山人海-2" desc="参观人次总数达到2000" type="6" value="10000" parent="101" del="1" diamond_once="15" coin_person="" person="" icon="4大技能1" />
+  <item id="103" index="6" name="人山人海-3" desc="参观人次总数达到10000" type="6" value="50000" parent="102" del="1" diamond_once="20" coin_person="" person="" icon="4大技能1" />
+  <item id="104" index="6" name="人山人海-4" desc="参观人次总数达到50000" type="6" value="150000" parent="103" del="1" diamond_once="25" coin_person="" person="" icon="4大技能1" />
+  <item id="105" index="6" name="人山人海-5" desc="参观人次总数达到150000" type="6" value="300000" parent="104" del="1" diamond_once="40" coin_person="" person="" icon="4大技能1" />
+  <item id="106" index="6" name="人山人海-6" desc="参观人次总数达到300000" type="6" value="800000" parent="105" del="0" diamond_once="50" coin_person="" person="" icon="4大技能1" />
+  <item id="121" index="7" name="技能大师-1" desc="使用技能5次" type="7" value="5" parent="" del="1" diamond_once="15" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="122" index="7" name="技能大师-2" desc="使用技能10次" type="7" value="30" parent="121" del="1" diamond_once="20" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="123" index="7" name="技能大师-3" desc="使用技能20次" type="7" value="80" parent="122" del="1" diamond_once="35" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="124" index="7" name="技能大师-4" desc="使用技能50次" type="7" value="200" parent="123" del="1" diamond_once="50" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="125" index="7" name="技能大师-5" desc="使用技能150次" type="7" value="350" parent="124" del="1" diamond_once="65" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="126" index="7" name="技能大师-6" desc="使用技能250次" type="7" value="500" parent="125" del="0" diamond_once="80" coin_person="" person="" icon="红-黄鹂鸟" />
+  <item id="141" index="8" name="鉴赏大师-1" desc="观看2次广告" type="8" value="2" parent="" del="1" diamond_once="15" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="142" index="8" name="鉴赏大师-2" desc="观看5次广告" type="8" value="5" parent="141" del="1" diamond_once="20" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="143" index="8" name="鉴赏大师-3" desc="观看10次广告" type="8" value="10" parent="142" del="1" diamond_once="35" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="144" index="8" name="鉴赏大师-4" desc="观看15次广告" type="8" value="45" parent="143" del="1" diamond_once="50" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="145" index="8" name="鉴赏大师-5" desc="观看25次广告" type="8" value="100" parent="144" del="1" diamond_once="65" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="146" index="8" name="鉴赏大师-6" desc="观看40次广告" type="8" value="180" parent="145" del="0" diamond_once="80" coin_person="" person="" icon="蓝-免费钻" />
+  <item id="161" index="9" name="按时打卡-1" desc="签到5次" type="9" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="红-彩虹" />
+  <item id="162" index="9" name="按时打卡-2" desc="签到10次" type="9" value="10" parent="161" del="1" diamond_once="15" coin_person="" person="" icon="红-彩虹" />
+  <item id="163" index="9" name="按时打卡-3" desc="签到15次" type="9" value="25" parent="162" del="1" diamond_once="20" coin_person="" person="" icon="红-彩虹" />
+  <item id="164" index="9" name="按时打卡-4" desc="签到25次" type="9" value="50" parent="163" del="1" diamond_once="25" coin_person="" person="" icon="红-彩虹" />
+  <item id="165" index="9" name="按时打卡-5" desc="签到35次" type="9" value="85" parent="164" del="1" diamond_once="40" coin_person="" person="" icon="红-彩虹" />
+  <item id="166" index="9" name="按时打卡-6" desc="签到50次" type="9" value="150" parent="165" del="0" diamond_once="50" coin_person="" person="" icon="红-彩虹" />
+  <item id="181" index="10" name="乐于分享-1" desc="分享1次" type="10" value="1" parent="" del="1" diamond_once="10" coin_person="" person="" icon="红-樱花树" />
+  <item id="182" index="10" name="乐于分享-2" desc="分享5次" type="10" value="5" parent="181" del="1" diamond_once="15" coin_person="" person="" icon="红-樱花树" />
+  <item id="183" index="10" name="乐于分享-3" desc="分享10次" type="10" value="10" parent="182" del="1" diamond_once="20" coin_person="" person="" icon="红-樱花树" />
+  <item id="184" index="10" name="乐于分享-4" desc="分享15次" type="10" value="15" parent="183" del="1" diamond_once="25" coin_person="" person="" icon="红-樱花树" />
+  <item id="185" index="10" name="乐于分享-5" desc="分享25次" type="10" value="25" parent="184" del="1" diamond_once="40" coin_person="" person="" icon="红-樱花树" />
+  <item id="186" index="10" name="乐于分享-6" desc="分享40次" type="10" value="40" parent="185" del="1" diamond_once="50" coin_person="" person="" icon="红-樱花树" />
+  <item id="187" index="10" name="乐于分享-7" desc="" type="10" value="80" parent="186" del="1" diamond_once="65" coin_person="" person="" icon="红-樱花树" />
+  <item id="188" index="10" name="乐于分享-8" desc="" type="10" value="120" parent="187" del="0" diamond_once="80" coin_person="" person="" icon="红-樱花树" />
+  <item id="201" index="11" name="辛勤的花匠-1" desc="完成小游戏5次" type="11" value="5" parent="" del="1" diamond_once="10" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="202" index="11" name="辛勤的花匠-2" desc="完成小游戏10次" type="11" value="10" parent="201" del="1" diamond_once="15" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="203" index="11" name="辛勤的花匠-3" desc="完成小游戏30次" type="11" value="50" parent="202" del="1" diamond_once="20" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="204" index="11" name="辛勤的花匠-4" desc="完成小游戏50次" type="11" value="100" parent="203" del="1" diamond_once="25" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="205" index="11" name="辛勤的花匠-5" desc="完成小游戏100次" type="11" value="200" parent="204" del="1" diamond_once="40" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="206" index="11" name="辛勤的花匠-6" desc="完成小游戏200次" type="11" value="500" parent="205" del="0" diamond_once="50" coin_person="" person="" icon="黄-黄色蜜蜂" />
+  <item id="221" index="12" name="积少成多-1" desc="收集花园里的金币50次" type="12" value="50" parent="" del="1" diamond_once="10" coin_person="" person="" icon="绿-金币包3" />
+  <item id="222" index="12" name="积少成多-2" desc="收集花园里的金币100次" type="12" value="100" parent="221" del="1" diamond_once="15" coin_person="" person="" icon="绿-金币包3" />
+  <item id="223" index="12" name="积少成多-3" desc="收集花园里的金币300次" type="12" value="450" parent="222" del="1" diamond_once="20" coin_person="" person="" icon="绿-金币包3" />
+  <item id="224" index="12" name="积少成多-4" desc="收集花园里的金币600次" type="12" value="1000" parent="223" del="1" diamond_once="25" coin_person="" person="" icon="绿-金币包3" />
+  <item id="225" index="12" name="积少成多-5" desc="收集花园里的金币1000次" type="12" value="2000" parent="224" del="1" diamond_once="40" coin_person="" person="" icon="绿-金币包3" />
+  <item id="226" index="12" name="积少成多-6" desc="收集花园里的金币2500次" type="12" value="3500" parent="225" del="0" diamond_once="50" coin_person="" person="" icon="绿-金币包3" />
   <comment>
     <id>
 

+ 3 - 3
Assets/Resource/XML/PlayerConfig.xml

@@ -1,8 +1,8 @@
 <PlayerConfig>
-  <Version value="540" />
+  <Version value="548" />
 
   <ID value="Default" />
-////  <TutorialA value="1" />
+////  <TutorialA value="0" />
 ////  <TutorialB value="1" />
 ////  <TutorialC value="1" />
   <TutorialIndexA value="1" />
@@ -10,7 +10,7 @@
   <TutorialIndexC value="1" />
 
   <Player value="PlayerBlond" />
-////  <QuitFlag value="0" />
+  <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />
   <SignTime value="4/23/2017 09:30:00 AM" />
   <Language value="ChineseSimplified" />

+ 3 - 3
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -40,7 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[退出游戏]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[领取奖励]]></Da_GetAwardLab>
-    <Da_HigherScore desc=""><![CDATA[需要更高的分数来解锁花朵]]></Da_HigherScore>
+    <Da_HigherScore desc=""><![CDATA[需要更高的分数来解锁你遇见的新花朵]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
@@ -200,8 +200,8 @@
     <QuitGame desc=""><![CDATA[退出游戏?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已经没有空地了]]></NoValidSlot>
     <Unlock desc=""><![CDATA[未解锁]]></Unlock>
-    <ShareTit desc=""><![CDATA[分享标题]]></ShareTit>
-    <ShareContent desc=""><![CDATA[分享内容]]></ShareContent>
+    <ShareTit desc=""><![CDATA[这是你的甜蜜花园]]></ShareTit>
+    <ShareContent desc=""><![CDATA[最美丽、最可爱的养成游戏,赶紧看过来!]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失败]]></ShareFail>
     <IdentifyID desc=""><![CDATA[相同的ID]]></IdentifyID>

+ 3 - 3
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -40,7 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[退出遊戲]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[領取獎勵]]></Da_GetAwardLab>
-    <Da_HigherScore desc=""><![CDATA[需要更高的分數來解鎖花朵]]></Da_HigherScore>
+    <Da_HigherScore desc=""><![CDATA[需要更高的分數來解鎖你遇見的新花朵]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
@@ -200,8 +200,8 @@
     <QuitGame desc=""><![CDATA[退出遊戲?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[已經沒有空地了]]></NoValidSlot>
     <Unlock desc=""><![CDATA[未解鎖]]></Unlock>
-    <ShareTit desc=""><![CDATA[]]></ShareTit>
-    <ShareContent desc=""><![CDATA[]]></ShareContent>
+    <ShareTit desc=""><![CDATA[這是你的甜蜜花園]]></ShareTit>
+    <ShareContent desc=""><![CDATA[最美麗、最可愛的養成遊戲,趕緊看過來!]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失敗]]></ShareFail>
     <IdentifyID desc=""><![CDATA[相同的ID]]></IdentifyID>

+ 3 - 3
Assets/Resource/XML/lan/English.xml

@@ -40,7 +40,7 @@
     <Da_QuitLab desc=""><![CDATA[Quit]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[Cancel]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[Get Reward]]></Da_GetAwardLab>
-    <Da_HigherScore desc=""><![CDATA[Need higher score to unlock a flower]]></Da_HigherScore>
+    <Da_HigherScore desc=""><![CDATA[Need higher score to unlock the new flower]]></Da_HigherScore>
     <G_Tit desc=""><![CDATA[Flowers]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
@@ -200,8 +200,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <QuitGame desc=""><![CDATA[Are you sure to quit?]]></QuitGame>
     <NoValidSlot desc=""><![CDATA[There is no valid slot]]></NoValidSlot>
     <Unlock desc=""><![CDATA[Unlock]]></Unlock>
-    <ShareTit desc=""><![CDATA[]]></ShareTit>
-    <ShareContent desc=""><![CDATA[]]></ShareContent>
+    <ShareTit desc=""><![CDATA[Take a look at your lovely garden]]></ShareTit>
+    <ShareContent desc=""><![CDATA[This is the most lovely and beautiful game you never seen!]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[Share success]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[Share fail]]></ShareFail>
     <IdentifyID desc=""><![CDATA[Identify ID]]></IdentifyID>

+ 5 - 4
Assets/Script/Manage/ManaCenter.cs

@@ -1079,8 +1079,6 @@ public class ManaCenter : Regist
 
 #region DebugList
 
-//离线期间、Reactive、Reload等效
-
 //离线期间的收入
 //{
 //  技能等级大于1时
@@ -1094,7 +1092,10 @@ public class ManaCenter : Regist
 //离线期间的冷却时间
 //离线期间从使用变为冷却
 
-//技能冷却时间Buff
-//多次Reload、Reactive后的技能冷却时间Buff
+//多次Reload、Reactive后的技能效果(冷却减益)
+
+//技能的效果
+//技能升级后的效果
+//技能结束后的效果
 
 #endregion

+ 3 - 3
Assets/Script/Manage/ManaIAP.cs

@@ -211,15 +211,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     public static void Share()
     {
         ShareContent shareContent = new ShareContent();
-        
+
         shareContent.SetText(Language.GetStr("Common", "ShareContent"));
         shareContent.SetTitle(Language.GetStr("Common", "ShareTit"));
 
         shareContent.SetUrl(ShareUrl);
-        shareContent.SetImagePath(ImageUrl);
+        //shareContent.SetImagePath(ImageUrl);
 
         shareContent.SetShareType(ContentType.App);
-        
+
         ShareSdk.ShowPlatformList(null, shareContent, 100, 100);
     }
 

+ 2 - 0
Assets/Script/Manage/ManaTutorial.cs

@@ -924,6 +924,8 @@ public class ManaTutorial : Regist
 
 #region DebugList
 
+//教程有A、C两部分
+
 //教程结束后各部分能否正常运行
 //教程的存档
 //中途进入教程的遮罩

+ 3 - 0
Assets/Script/Object/Skill/Ability.cs

@@ -509,6 +509,9 @@ public class Ability : SkillRoot
                 }
             }
         );
+
+        Debug.Log(NewPerson);
+        Debug.Log(NewCoinPerson);
     }
 
     protected void UnlockAhead()

+ 1 - 1
Assets/Script/Object/Skill/Skill.cs

@@ -258,7 +258,7 @@ public class Skill : SkillRoot
     protected virtual void UseB()
     {
         float temp = NewCoinOnce + ManaCenter.CoinPerson * NewCoinOnceBuff;
-
+        
         ManaCenter.Coin += temp;
         ManaCenter.Diamond += DiamondOnce;
 

+ 1 - 1
Assets/Script/Tool/DashGame/Logo.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+ using UnityEngine;
 using UnityEngine.SceneManagement;
 
 using System;

+ 26 - 23
MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,24 +15,27 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

+ 3 - 0
ToList.txt

@@ -1,3 +1,6 @@
+开启图片分享
+
+
 Unity Ads 代码和ServiceWindow 测试模式
 
 发布前把服务器中的存档清理一次