Browse Source

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

# Conflicts:
#	Assets/Resource/Logo.unity
#	Assets/Resource/Prefab/PrefabUI/GroupA.prefab
#	Assets/Script/Tool/Auxiliary.cs
#	ToList.txt
jet 8 years ago
parent
commit
c00a30ac9a

+ 0 - 9
Assets/Advertisements/Editor/Resources/Android.meta

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

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

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="655" />
+  <Version value="662" />
 
   <ID value="Default" />
-  <TutorialA value="1" />
-  <TutorialB value="1" />
-  <TutorialC value="1" />
+////  <TutorialA value="0" />
+////  <TutorialB value="0" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -49,7 +49,7 @@
     <Skill ID="Pack10" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack11" SkillType="Pack" ItemStatus="Lock" Level="0" />
     
-    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Lock" Level="0" />
+    <Skill ID="Ability1" SkillType="Ability" ItemStatus="Upgrade" Level="14" />
     <Skill ID="Ability2" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability3" SkillType="Ability" ItemStatus="Lock" Level="0" />
     <Skill ID="Ability4" SkillType="Ability" ItemStatus="Lock" Level="0" />