liuqilin 7 роки тому
батько
коміт
229f8ff9e4

+ 25 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    iOS:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


BIN
Assets/Resource/Animations/人物动画/stand_texture.png


Різницю між файлами не показано, бо вона завелика
+ 188 - 175
Assets/Resource/Animations/人物动画/stand_texture.png.meta


+ 9 - 0
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -29,6 +29,11 @@
   <item id="28" jump_frequency="" type="1" index="26" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(紫)" spriteAlpha="" armatureName="头发8(紫)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="29" jump_frequency="" type="1" index="27" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(绿)" spriteAlpha="" armatureName="头发8(绿)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="30" jump_frequency="" type="1" index="28" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(黑)" spriteAlpha="" armatureName="头发8(黑)" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="32" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-蓝" spriteAlpha="" armatureName="头发9-蓝" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="33" jump_frequency="" type="1" index="30" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="34" jump_frequency="" type="1" index="31" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="35" jump_frequency="" type="1" index="32" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="36" jump_frequency="" type="1" index="33" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发15(咖啡)" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="头发15(咖啡)+下" ignore="" />
   <item id="401" jump_frequency="" type="6" index="0" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="402" jump_frequency="" type="6" index="1" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="403" jump_frequency="" type="6" index="2" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" />
@@ -44,6 +49,7 @@
   <item id="413" jump_frequency="" type="6" index="12" bodypart="3" level="40" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="414" jump_frequency="" type="6" index="13" bodypart="3" level="50" buy_currency="2" buy_amt="250" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="415" jump_frequency="" type="6" index="14" bodypart="3" level="50" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="417" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="201" jump_frequency="" type="3" index="0" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子1" spriteAlpha="" armatureName="裙子1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="202" jump_frequency="" type="3" index="1" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子2" spriteAlpha="" armatureName="裙子2" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="203" jump_frequency="" type="3" index="2" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子3" spriteAlpha="" armatureName="裙子3" extraBodypart="" extraArmatureName="" ignore="" />
@@ -61,6 +67,7 @@
   <item id="215" jump_frequency="" type="3" index="14" bodypart="2" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子12" spriteAlpha="" armatureName="裙子12" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="216" jump_frequency="" type="3" index="15" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13" spriteAlpha="" armatureName="裙子13" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="217" jump_frequency="" type="3" index="16" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13(紫)" spriteAlpha="" armatureName="裙子13(紫)" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="219" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣15" spriteAlpha="" armatureName="裙子15" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="601" jump_frequency="" type="4" index="0" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品1" spriteAlpha="" armatureName="头饰品1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="602" jump_frequency="" type="4" index="1" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品2" spriteAlpha="" armatureName="头饰品2" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="603" jump_frequency="" type="4" index="2" bodypart="4" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰品3" spriteAlpha="" armatureName="头饰品3" extraBodypart="" extraArmatureName="" ignore="" />
@@ -73,6 +80,7 @@
   <item id="610" jump_frequency="" type="4" index="9" bodypart="4" level="40" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰10" spriteAlpha="" armatureName="头饰10" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="611" jump_frequency="" type="4" index="10" bodypart="4" level="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰11" spriteAlpha="" armatureName="头饰11" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="612" jump_frequency="" type="4" index="11" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰12" spriteAlpha="" armatureName="头饰12" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="614" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰15" spriteAlpha="" armatureName="头饰15" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="801" jump_frequency="" type="2" index="0" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.32,19.11" icon2offset="53.41,16.68" spriteName="上衣1,上衣1袖子右,上衣1袖子左" spriteAlpha="" armatureName="上衣1" extraBodypart="10,9" extraArmatureName="短袖1右,短袖1左" ignore="" />
   <item id="802" jump_frequency="" type="2" index="1" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣2,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣2" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" />
   <item id="803" jump_frequency="" type="2" index="2" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣3,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣3" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" />
@@ -90,6 +98,7 @@
   <item id="815" jump_frequency="" type="2" index="14" bodypart="5" level="50" buy_currency="2" buy_amt="600" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-59.77,16.52" icon2offset="56.81,13.58" spriteName="上衣12,上衣12袖子右,上衣12袖子左" spriteAlpha="" armatureName="上衣12" extraBodypart="10,9" extraArmatureName="短袖12右,短袖12左" ignore="" />
   <item id="816" jump_frequency="" type="2" index="15" bodypart="5" level="50" buy_currency="2" buy_amt="650" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13,上衣13袖子右,上衣13袖子左" spriteAlpha="" armatureName="上衣13" extraBodypart="10,9" extraArmatureName="短袖13右,短袖13左" ignore="" />
   <item id="817" jump_frequency="" type="2" index="16" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13(紫),上衣13蓝袖子右,上衣13蓝袖子左" spriteAlpha="" armatureName="上衣13(紫)" extraBodypart="10,9" extraArmatureName="短袖13蓝右,短袖13蓝左" ignore="" />
+  <item id="819" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15(袖子)右,上衣15(袖子)左" ignore="" />
   <item id="1001" jump_frequency="" type="5" index="0" bodypart="6" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="禁止标志" spriteAlpha="0.75" armatureName="Empty" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="1002" jump_frequency="" type="5" index="1" bodypart="6" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀1" spriteAlpha="" armatureName="翅膀1" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="1003" jump_frequency="" type="5" index="2" bodypart="6" level="80" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀2" spriteAlpha="" armatureName="翅膀2" extraBodypart="" extraArmatureName="" ignore="" />

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


+ 4 - 4
Assets/Script/Manage/PlayerManager.cs

@@ -226,10 +226,10 @@ public class PlayerManager : Regist
 
     public static void InitDressRoom()
     {
-        foreach (var kv in CloseItemDictionary)
-        {
-            Debug.Log(kv.Value.ArmatureName);
-        }
+        //foreach (var kv in CloseItemDictionary)
+        //{
+        //    Debug.Log(kv.Value.ArmatureName);
+        //}
         for (int i = 0; i < BoughtCloseIDs.Count; i++)
         {
             CloseItemDictionary[BoughtCloseIDs[i]].Unlock();

+ 17 - 2
Assets/Script/Object/Player.cs

@@ -155,7 +155,9 @@ public class CloseItem
         BodyPart = BodyPartParse(attribute[4].Value);
         ArmatureName = attribute[16].Value;
 
+        Debug.Log(ArmatureName);
         PlayerManager.CloseIDDictionary.Add(ArmatureName, ID);
+        //Debug.Log(ID);
         PlayerManager.CloseItemDictionary.Add(ID, this);
 
         if (Unavailable)
@@ -832,6 +834,9 @@ public class Player : Regist , IPointerClickHandler
 	public DragonBones.Slot RightShoeSlot;
 	public DragonBones.Slot HeadWearSlot;
 
+    public string leftShoeDisplayName = "鞋子1";
+    public string rightShoeDisplayName = "鞋子1";
+
     public UnityArmatureComponent UAC;
     //public UnityArmatureComponent LeftShortSleeveUAC;
     //public UnityArmatureComponent RightShortSleeveUAC;
@@ -1736,6 +1741,7 @@ public class Player : Regist , IPointerClickHandler
             CloseItem closeItem = PlayerManager.CloseItemDictionary[id];
             Texture2D leftTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[0].name);
             Texture2D rightTexture;
+            leftShoeDisplayName = closeItem.Sprites[0].name;
             if (closeItem.Sprites.Length == 1)
             {
                 rightTexture = leftTexture;
@@ -1744,10 +1750,19 @@ public class Player : Regist , IPointerClickHandler
             {
                 rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
             }
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子1", LeftShoeSlot, 
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子左", "鞋子1", LeftShoeSlot, 
                 leftTexture, new Material(Shader.Find("Sprites/Default")));
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子1", RightShoeSlot,
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子右", "鞋子1", RightShoeSlot,
                 rightTexture, new Material(Shader.Find("Sprites/Default")));
+            leftShoeDisplayName = closeItem.Sprites[0].name;
+            if (closeItem.Sprites.Length == 1)
+            {
+                rightShoeDisplayName = closeItem.Sprites[0].name;
+            }
+            else
+            {
+                rightShoeDisplayName = closeItem.Sprites[1].name;
+            }
         }
         else if (bodyPart == BodyPart.Head)
         {

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

+ 4 - 0
第五期.txt

@@ -1,3 +1,7 @@
+5兆金币成就
+
+点击换小游戏卡住
+
 //关闭DebugMode 开启CatchException
 
 //切换到远程服务器 正常Zone

Деякі файли не було показано, через те що забагато файлів було змінено