liuqilin 7 rokov pred
rodič
commit
b5617d1c24

+ 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: 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


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


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 260 - 260
Assets/Resource/Animations/人物动画/stand_texture.png.meta


+ 17 - 17
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -34,24 +34,24 @@
   <item id="33" jump_frequency="" type="1" index="31" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <item id="34" jump_frequency="" type="1" index="32" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <item id="35" jump_frequency="" type="1" index="33" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="10" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <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="" icon0offset="" />
-  <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="" icon0offset="" />
-  <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="" icon0offset="" />
-  <item id="404" jump_frequency="" type="6" index="3" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="4" spriteAlpha="" armatureName="鞋子6" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="405" jump_frequency="" type="6" index="4" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子2" spriteAlpha="" armatureName="鞋子2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="15" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="404" jump_frequency="" type="6" index="3" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="4" spriteAlpha="" armatureName="鞋子6" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="405" jump_frequency="" type="6" index="4" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子2" spriteAlpha="" armatureName="鞋子2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
   <item id="406" jump_frequency="" type="6" index="5" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="12" spriteAlpha="" armatureName="鞋子14" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="407" jump_frequency="" type="6" index="6" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="13" spriteAlpha="" armatureName="鞋子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="408" jump_frequency="" type="6" index="7" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子3" spriteAlpha="" armatureName="鞋子3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="409" jump_frequency="" type="6" index="8" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="11" spriteAlpha="" armatureName="鞋子13" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="410" jump_frequency="" type="6" index="9" bodypart="3" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="6" spriteAlpha="" armatureName="鞋子8" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="411" jump_frequency="" type="6" index="10" bodypart="3" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="5" spriteAlpha="" armatureName="鞋子7" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <item id="412" jump_frequency="" type="6" index="11" bodypart="3" level="40" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="7" spriteAlpha="" armatureName="鞋子9" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
-  <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="" icon0offset="" />
-  <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="" icon0offset="" />
-  <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="" icon0offset="" />
-  <item id="416" 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="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
-  <item id="417" jump_frequency="" type="6" index="16" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="-35,0" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
+  <item id="407" jump_frequency="" type="6" index="6" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="13" spriteAlpha="" armatureName="鞋子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="408" jump_frequency="" type="6" index="7" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子3" spriteAlpha="" armatureName="鞋子3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="409" jump_frequency="" type="6" index="8" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="11" spriteAlpha="" armatureName="鞋子13" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="410" jump_frequency="" type="6" index="9" bodypart="3" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="6" spriteAlpha="" armatureName="鞋子8" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="411" jump_frequency="" type="6" index="10" bodypart="3" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="5" spriteAlpha="" armatureName="鞋子7" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="412" jump_frequency="" type="6" index="11" bodypart="3" level="40" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="7" spriteAlpha="" armatureName="鞋子9" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <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="15" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" />
+  <item id="416" 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="15" icon1offset="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
+  <item id="417" jump_frequency="" type="6" index="16" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="-35,0" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />
   <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="" icon0offset="" />

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


+ 1 - 1
Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs

@@ -13,7 +13,7 @@ public class AddShowHttp
     public static void Test()
     {
         FashionShowData data = new FashionShowData();
-        data.RefererId = "1000000";
+        data.RefererId = "100000";
         data.ShowName = "Name";
         data.ShowContent = "Content";
         data.CloseIDs.Add(0);

+ 1 - 1
Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs

@@ -12,7 +12,7 @@ public class CommentShowHttp
 
     public static void Test()
     {
-        Comment(0, 0, "0", null, null);
+        Comment(1000, 1, "comment", null, null);
     }
 
     public static void Comment(long playerId, int showId, string comment, Action succeedCallback, Action failedCallback)

+ 1 - 1
Assets/Script/Manage/FashionShowHttp/PraiseShowHttp.cs

@@ -12,7 +12,7 @@ public class PraiseShowHttp
 
     public static void Test()
     {
-        Praise(0, 0, null, null);
+        Praise(1, 1, null, null);
     }
 
     public static void Praise(long playerId, int showId, Action succeedCallback, Action failedCallback)

+ 7 - 7
Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs

@@ -13,13 +13,13 @@ public class RateShowHttp
     public static void Test()
     {
         ShowRateData data = new ShowRateData();
-        data.playerId = 0;
-        data.showId = 0;
-        data.cuteRate = 0;
-        data.graceRate = 0;
-        data.vividRate = 0;
-        data.simpleRate = 0;
-        data.gloryRate = 0;
+        data.playerId = 1;
+        data.showId = 1;
+        data.cuteRate = 1;
+        data.graceRate = 1;
+        data.vividRate = 1;
+        data.simpleRate = 1;
+        data.gloryRate = 1;
         Rate(data, null, null);
     }
 

+ 1 - 1
Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs

@@ -27,7 +27,7 @@ public class ShowCommentsHttp
         //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
         //    Callback, URLRequest.Method.POST);
 
-        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowListURL, requestData,
+        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowCommentListURL, requestData,
             Callback, URLRequest.Method.POST);
     }
 

+ 3 - 7
Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs

@@ -12,7 +12,7 @@ public class ShowListHttp
 
     public static void Test()
     {
-        Get(0, 0, null, null);
+        Get(0, FashionShowType.All, null, null);
     }
 
     public static void Get(int page, FashionShowType type, Action succeedCallback, Action failedCallback)
@@ -20,13 +20,9 @@ public class ShowListHttp
         ShowListHttp.succeedCallback = succeedCallback;
         ShowListHttp.failedCallback = failedCallback;
 
-        //URLRequestData requestData = new URLRequestData();
-        //requestData.Add("p", page);
-        //requestData.Add("s", type.GetHashCode());
-
         URLRequestData requestData = new URLRequestData();
-        requestData.Add("s", 0);
-        requestData.Add("p", 0);
+        requestData.Add("p", page);
+        requestData.Add("s", type.GetHashCode());
 
         //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
         //    Callback, URLRequest.Method.POST);

+ 1 - 1
Assets/Script/Manage/HttpManager.cs

@@ -184,7 +184,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        AddShowHttp.Test();
+        ShowCommentsHttp.Test();
 
         //URLRequestData urlData = new URLRequestData();
         //urlData.Add("u", "Custom0");

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

@@ -1752,9 +1752,9 @@ public class Player : Regist , IPointerClickHandler
             {
                 rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
             }
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
                 leftTexture, new Material(Shader.Find("Sprites/Default")));
-            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
+            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
                 rightTexture, new Material(Shader.Find("Sprites/Default")));
             leftShoeDisplayName = closeItem.Sprites[0].name;
             if (closeItem.Sprites.Length == 1)

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov