调整ios

Assets/Editor/AssetBundle/AssetBundleMap.cs

@@ -218,7 +218,7 @@ public class AssetBundleMap : EditorWindow
                 {
                     fileName = AssetsObscureUtil.GetABFileName(fileName);
                 }
-                else if (fileName == "assetsmapping.bytes")
+                else if (fileName == $"{ GetAssetsMappingName()}.bytes")
                 {
                     EncryptAssetsmapping(file, Path.Combine(assetBundlePath, fileName));
                     continue;
@@ -232,9 +232,18 @@ public class AssetBundleMap : EditorWindow
         AssetDatabase.Refresh();
     }
 
+    private static object GetAssetsMappingName()
+    {
+#if UNITY_IOS
+        return "afi";
+#else
+        return "assetsmapping";
+#endif
+    }
+
     private static Dictionary<BuildTarget, string> s_AssetbundleSavePaths = new Dictionary<BuildTarget, string>()
     {
-        {BuildTarget.iOS, "/ios/"},
+        {BuildTarget.iOS, "/unityRes/"},
         {BuildTarget.Android, "/AssetsAndroid/"},
         {BuildTarget.StandaloneWindows64, "/AssetsPC/"},
          {BuildTarget.WebGL, "/AssetsPC/"},

Assets/Editor/AssetBundle/AssetBundleUtil.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
 using System.IO;
@@ -1105,12 +1105,20 @@ public class AssetBundleUtil : EditorWindow
         //Create a text file
         UTF8Encoding encoding = new UTF8Encoding(false);
         byte[] bytes = encoding.GetBytes(sb.ToString());
-        using (var fs = File.Open(s_TempAssetBundlePath + "/assetsmapping.bytes", FileMode.OpenOrCreate, FileAccess.ReadWrite))
+
+        using (var fs = File.Open(s_TempAssetBundlePath +$"/{ GetAssetsMappingName()}.bytes", FileMode.OpenOrCreate, FileAccess.ReadWrite))
         {
             fs.Write(bytes, 0, bytes.Length);
         }
     }
-
+    private static string GetAssetsMappingName()
+    {
+#if UNITY_IOS
+        return "afi";
+#else
+        return "assetsmapping";
+#endif
+    }
     static string[] GetAssetsNamesExcludeFileExtension(string path)
     {
         bool isAsset = false;

Assets/Editor/AssetBundle/BundleBuilderZ.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -288,7 +288,7 @@ public class BundleBuilderZ : EditorWindow
         BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget;
         if (buildTarget == BuildTarget.iOS)
         {
-            path = path + "/ios/";
+            path = path + "/unityRes/";
         }
         else if (buildTarget == BuildTarget.Android)
         {

Assets/Lua/Config/EquipRefineCfg.lua

@@ -164,5 +164,390 @@ local EquipRefineCfg = {
 ['rate']=10000,
 ['Result']=180,
 },
+[16]={
+['Id']=16,
+['Place1']={1,2,5,4},
+['Costzeny1']=500000,
+['Costitem1']={{101,300}},
+['Place2']={3,6},
+['Costzeny2']=500000,
+['Costitem2']={{102,300}},
+['rate']=10000,
+['Result']=192,
+},
+[17]={
+['Id']=17,
+['Place1']={1,2,5,4},
+['Costzeny1']=500000,
+['Costitem1']={{101,300}},
+['Place2']={3,6},
+['Costzeny2']=500000,
+['Costitem2']={{102,300}},
+['rate']=10000,
+['Result']=204,
+},
+[18]={
+['Id']=18,
+['Place1']={1,2,5,4},
+['Costzeny1']=500000,
+['Costitem1']={{101,300}},
+['Place2']={3,6},
+['Costzeny2']=500000,
+['Costitem2']={{102,300}},
+['rate']=10000,
+['Result']=216,
+},
+[19]={
+['Id']=19,
+['Place1']={1,2,5,4},
+['Costzeny1']=500000,
+['Costitem1']={{101,300}},
+['Place2']={3,6},
+['Costzeny2']=500000,
+['Costitem2']={{102,300}},
+['rate']=10000,
+['Result']=228,
+},
+[20]={
+['Id']=20,
+['Place1']={1,2,5,4},
+['Costzeny1']=500000,
+['Costitem1']={{101,300}},
+['Place2']={3,6},
+['Costzeny2']=500000,
+['Costitem2']={{102,300}},
+['rate']=10000,
+['Result']=240,
+},
+[21]={
+['Id']=21,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=255,
+},
+[22]={
+['Id']=22,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=270,
+},
+[23]={
+['Id']=23,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=285,
+},
+[24]={
+['Id']=24,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=300,
+},
+[25]={
+['Id']=25,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=315,
+},
+[26]={
+['Id']=26,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=330,
+},
+[27]={
+['Id']=27,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=345,
+},
+[28]={
+['Id']=28,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=360,
+},
+[29]={
+['Id']=29,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=375,
+},
+[30]={
+['Id']=30,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,350}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,350}},
+['rate']=10000,
+['Result']=390,
+},
+[31]={
+['Id']=31,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=405,
+},
+[32]={
+['Id']=32,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=420,
+},
+[33]={
+['Id']=33,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=435,
+},
+[34]={
+['Id']=34,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=450,
+},
+[35]={
+['Id']=35,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=465,
+},
+[36]={
+['Id']=36,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=480,
+},
+[37]={
+['Id']=37,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=495,
+},
+[38]={
+['Id']=38,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=510,
+},
+[39]={
+['Id']=39,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=525,
+},
+[40]={
+['Id']=40,
+['Place1']={1,2,5,4},
+['Costzeny1']=1000000,
+['Costitem1']={{101,400}},
+['Place2']={3,6},
+['Costzeny2']=1000000,
+['Costitem2']={{102,400}},
+['rate']=10000,
+['Result']=540,
+},
+[41]={
+['Id']=41,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=555,
+},
+[42]={
+['Id']=42,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=570,
+},
+[43]={
+['Id']=43,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=585,
+},
+[44]={
+['Id']=44,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=600,
+},
+[45]={
+['Id']=45,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=615,
+},
+[46]={
+['Id']=46,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=630,
+},
+[47]={
+['Id']=47,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=645,
+},
+[48]={
+['Id']=48,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=660,
+},
+[49]={
+['Id']=49,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=675,
+},
+[50]={
+['Id']=50,
+['Place1']={1,2,5,4},
+['Costzeny1']=1500000,
+['Costitem1']={{101,500}},
+['Place2']={3,6},
+['Costzeny2']=1500000,
+['Costitem2']={{102,500}},
+['rate']=10000,
+['Result']=690,
+},
 }
 return EquipRefineCfg

Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -194,7 +194,7 @@ local RuneShopGiftsCfg = {
 },
 [17]={
 ['Id']=17,
-['Name']='周直購禮包17',
+['Name']='周直購禮包11',
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
 ['RMB']=19.99,
@@ -397,28 +397,16 @@ local RuneShopGiftsCfg = {
 ['RmbTotalPay']=0,
 },
 [40]={
-    ['Id']=40,
-    ['Name']='神器材料包(周)',
-    ['Pic']='ShopIcons/market_giftbox20',
-    ['Type']=2,
-    ['RMB']=49.99,
-    ['Reward']={{117,200},{48,10000},{2,500000}},
-    ['FirstBuyPic']='',
-    ['ExtraBuyPic']='',
-    ['SortId']=11,
-    ['RmbTotalPay']=99,
-    },
-[17]={
-['Id']=17,
-['Name']='周直購禮包11',
-['Pic']='ShopIcons/ic_club_gold_98',
+['Id']=40,
+['Name']='神器材料包(周)',
+['Pic']='ShopIcons/market_giftbox20',
 ['Type']=2,
-['RMB']=19.99,
-['Reward']={{54,6666},{2,666666}},
+['RMB']=49.99,
+['Reward']={{117,200},{48,10000},{2,500000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
-['SortId']=4,
-['RmbTotalPay']=0,
+['SortId']=11,
+['RmbTotalPay']=99,
 },
 [50]={
 ['Id']=50,

Assets/Src/Core/Base/FileSystem.cs

@@ -46,9 +46,9 @@ public class FileSystem
 
 #if UNITY_IPHONE
 #if UNITY_EDITOR
-		    m_PackagePath = Application.streamingAssetsPath + "/ios/";
+		    m_PackagePath = Application.streamingAssetsPath + "/unityRes/";
 #else
-		    m_PackagePath = Application.dataPath + "/Raw/ios/";
+		    m_PackagePath = Application.dataPath + "/Raw/unityRes/";
 #endif
 #elif UNITY_ANDROID
 #if UNITY_EDITOR
@@ -174,7 +174,7 @@ public class FileSystem
             if (string.IsNullOrEmpty(m_PlatformPath))
             {
 #if UNITY_IPHONE
-                m_PlatformPath = "ios/";
+                m_PlatformPath = "unityRes/";
 #elif UNITY_ANDROID
                 m_PlatformPath = "AssetsAndroid/";
 #else

Assets/Src/Core/Resource/AssetsMgr.cs

@@ -384,12 +384,22 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
 #endif
     }
 
+    private string GetAssetsMappingName()
+    {
+#if UNITY_IOS
+        Debug.Log("============afi============");
+        return "{0}afi.bytes";
+#else
+        return "{0}assetsmapping.bytes";
+#endif
+    }
+
     private void  GetAssetsMappingSync()
     {
-        string path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalDocumentPath);
+        string path = string.Format(GetAssetsMappingName(), FileSystem.LocalDocumentPath);
         if (!FileSystem.Exists(path))
         {
-            path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalPackagePath);
+            path = string.Format(GetAssetsMappingName(), FileSystem.LocalPackagePath);
         }
         if (!path.Contains("file://"))
         {
@@ -444,10 +454,10 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
         string path = null;
         if (null == assetBundleManifest)
         {
-            path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalDocumentPath);
+            path = string.Format(GetAssetsMappingName(), FileSystem.LocalDocumentPath);
             if (!FileSystem.Exists(path))
             {
-                path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalPackagePath);
+                path = string.Format(GetAssetsMappingName(), FileSystem.LocalPackagePath);
             }
             if (!path.Contains("file://"))
             {
@@ -641,10 +651,10 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
 
     IEnumerator GetAssetsMapping()
     {
-        string path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalDocumentPath);
+        string path = string.Format(GetAssetsMappingName(), FileSystem.LocalDocumentPath);
         if (!FileSystem.Exists(path))
         {
-            path = string.Format("{0}assetsmapping.bytes", FileSystem.LocalPackagePath);
+            path = string.Format(GetAssetsMappingName(), FileSystem.LocalPackagePath);
         }
 
         if(!path.Contains("file://"))
@@ -1623,7 +1633,7 @@ public class AssetsMgr : SingletonMono<AssetsMgr>
         }
     }
 
-    #region inner_methods
+#region inner_methods
     public AssetBundleCreateRequest CreatePackageLoader(string bundleName)
     {
         AssetBundleCreateRequest abRequest = null;