修复UI Bug

Assets/Resource/Shader/DragonboneUGUIMat.mat

@@ -39,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
+        m_Texture: {fileID: 2800000, guid: c0256ea9e745dc544ae7035b55f87b84, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Resource/Sprite/Editor/SpriteUI/fill_bg.png.meta

@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: ec37ef6e8794b4b44a015fd431683eaa
+timeCreated: 1530234000
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="42" />
+  <Version value="43" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

Assets/Script/AssetBundleUtility/AssetBundleUtility.prefab

@@ -56,13 +56,13 @@ MonoBehaviour:
     MD5DictionaryFileName: AndroidMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Android
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 15769c76b0a898c43956a2170104105a, type: 3}
+    - Object: {fileID: 102900000, guid: 773613e0fa4cc094ca162741d97a2500, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 18eafc5a1207e0b4684cc02a99268365, type: 3}
+    - Object: {fileID: 102900000, guid: 8fb4da250528ad14f8a3fba6268d5197, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 77060b67a7f8b1a4982d5d68ec1f2144, type: 3}
+    - Object: {fileID: 102900000, guid: ee5fee89fa104cf41a76583857c4a30a, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 40f2765e25fe6804d9296ec83ee9f5f0, type: 3}
+    - Object: {fileID: 102900000, guid: bd1e91f7137571548abfcd709c9ffb31, type: 3}
       URL: null
   - MD5FileName: IOSMD5.txt
     MD5DictionaryFileName: IOSMD5Dictionary.txt
@@ -80,11 +80,11 @@ MonoBehaviour:
     MD5DictionaryFileName: WindowsMD5Dictionary#VERSION.txt
     OutputPath: Assets\HotUpdate\Windows
     AssetBundleSets:
-    - Object: {fileID: 102900000, guid: 06276d44c4639a7418419ea01bd91f64, type: 3}
+    - Object: {fileID: 102900000, guid: 2fc161b61d959124eaab94c4e3ac5ab9, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 6a1ee4b0395a170498c4130082b3757d, type: 3}
+    - Object: {fileID: 102900000, guid: e1235e583c8429f448217f2c095145df, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 77a0d550aa65e7d4c81cd5642e728469, type: 3}
+    - Object: {fileID: 102900000, guid: 69be5c43ca4b79949a62aedb799c9cf5, type: 3}
       URL: null
-    - Object: {fileID: 102900000, guid: 99e4b5702e0728846a7b147f22863899, type: 3}
+    - Object: {fileID: 102900000, guid: 6ac7e53c87f1b4e4d81bd6347744ed10, type: 3}
       URL: null

Assets/Script/Manage/ConfigManager.cs

@@ -1650,6 +1650,13 @@ public class ConfigManager : Regist
             ToVersion42(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 43)
+        {
+            Debug.LogWarning("UpdateArchive to 43");
+
+            ToVersion43(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -2247,4 +2254,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion43(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 43.ToString();
+
+        string persistentFolderPath = string.Format("{0}{1}HotUpdate", Application.persistentDataPath, Path.DirectorySeparatorChar);
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/UIManager.cs

@@ -54,12 +54,18 @@ public class UIManager : Regist
         tra.parent = Instance.transform;
 
         Canvas = ResourceManager.Get(ResourceLabel.Canvas, Folder.UI, true, tra, false, ObjType.Canvas);
+        Canvas.SetActive(false);
+
         Camera = ResourceManager.Get(ResourceLabel.MainCamera, Folder.UI, true, tra, false, ObjType.MainCamera);
         EventSystem = ResourceManager.Get(ResourceLabel.EventSystem, Folder.UI, false, tra, false, ObjType.EventSystem);
 
+
         ScreenAdapt screenAdapt = Camera.AddComponent<ScreenAdapt>();
         screenAdapt.cam = Camera.GetComponent<Camera>();
         screenAdapt.scaler = Canvas.GetComponent<CanvasScaler>();
+        screenAdapt.AdaptScreen();
+
+        Canvas.SetActive(true);
 
         ResourceManager.SetActive(CanvasLabel.C_Main, true);
         ResourceManager.SetActive(CanvasLabel.U_LoadingPanel, true);

Assets/Script/Manage/VisitManager.cs

@@ -768,6 +768,8 @@ public class VisitManager : Regist
         VisiteePlayer = PlayerManager.Instance.GetPlayer(VisiteeRootNode);
         VisiteePlayer.SetAllCollider(false);
 
+        selfPlayer.SetParent(VisiteePlayer.transform);
+
         Garden.PlayerPos = new List<Vector3>();
 
         Garden.Player = ResourceManager.Get(PlayerLabel.Player);

Assets/Script/Tool/Bundle.cs

@@ -20,7 +20,7 @@ public class Bundle : MonoBehaviour
 {
     #region
 
-    public static string version = "1_3_4";
+    public static string version = "1_3_5";
 
     public static bool CopyComplete
     {
@@ -827,12 +827,12 @@ public class Bundle : MonoBehaviour
                 //Debug.Log(localMD5);
                 //Debug.Log(HttpManager.Md5);
                 needUpdate = localMD5 != HttpManager.Md5;
-                //Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
-            }
-            if (Application.isEditor || Application.isMobilePlatform)
-            {
-                needUpdate = false;
+                Debug.LogWarning(string.Format("NeedUpdate : {0}", needUpdate));
             }
+            //if (Application.isEditor || Application.isMobilePlatform)
+            //{
+            //    needUpdate = false;
+            //}
             AssetBundleUtility.OnDownloadOrUpdateFinish += FinishDownloadAndLoad;
             if (needUpdate)
             {

Assets/Script/Tool/ScreenAdapt.cs

@@ -8,7 +8,7 @@ public class ScreenAdapt : MonoBehaviour
     public Camera cam;
     public CanvasScaler scaler;
 
-    public void Start()
+    public void AdaptScreen()
     {
         if (Application.isEditor)
         {
@@ -17,7 +17,7 @@ public class ScreenAdapt : MonoBehaviour
 
         AdaptScreen(Screen.width, Screen.height);
 
-        //AdaptScreen(1600, 1000);
+        //AdaptScreen(1900, 900);
     }
 
     public void AdaptScreen(float sceenWidth, float screenHeight)

ProjectSettings/ProjectSettings.asset

@@ -125,7 +125,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3.4
+  bundleVersion: 1.3.5
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -156,8 +156,8 @@ PlayerSettings:
     iOS: com.dashgame.garden
     tvOS: com.dashgame.garden
   buildNumber:
-    iOS: 20
-  AndroidBundleVersionCode: 28
+    iOS: 21
+  AndroidBundleVersionCode: 29
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1

第五期.txt

@@ -1,7 +1,3 @@
-访问时角色会走出视野
-
-
-
 增加服装流程 骨骼位置 UI上的位置 语言文档 存档