Browse Source

修復BUG

胡佳骏 1 year ago
parent
commit
e2e154c223

+ 0 - 0
Assets/2.0/Resources/Template/Prefab.meta → Assets/2.0/Resources/Template/PrefabNew.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Image.prefab → Assets/2.0/Resources/Template/PrefabNew/Image.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Image.prefab.meta → Assets/2.0/Resources/Template/PrefabNew/Image.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Model.prefab → Assets/2.0/Resources/Template/PrefabNew/Model.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Model.prefab.meta → Assets/2.0/Resources/Template/PrefabNew/Model.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Text.prefab → Assets/2.0/Resources/Template/PrefabNew/Text.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Text.prefab.meta → Assets/2.0/Resources/Template/PrefabNew/Text.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Video.prefab → Assets/2.0/Resources/Template/PrefabNew/Video.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Video.prefab.meta → Assets/2.0/Resources/Template/PrefabNew/Video.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Video1.prefab → Assets/2.0/Resources/Template/PrefabNew/Video1.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Video1.prefab.meta → Assets/2.0/Resources/Template/PrefabNew/Video1.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Tip.prefab → Assets/Resources/Template/Prefab/Tip.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/Tip.prefab.meta → Assets/Resources/Template/Prefab/Tip.prefab.meta


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/TipJD.prefab → Assets/Resources/Template/Prefab/TipJD.prefab


+ 0 - 0
Assets/2.0/Resources/Template/Prefab/TipJD.prefab.meta → Assets/Resources/Template/Prefab/TipJD.prefab.meta


+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
+    vuforiaLicenseKey: 
     ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2

+ 1 - 1
Assets/Scripts/Blue/Patch/Video/Patch_VideoController.cs

@@ -20,7 +20,7 @@ public class Patch_VideoController : AbstractController
             Destroy(boundingBox);
         }
 
-        toggle = GameObject.Find("SetBtn/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
+        toggle = GameObject.Find("SetBtn/2.1/Canvas/Parent/EditorBtn/Toggle").GetComponent<Toggle>();
     }
 
     private Toggle toggle;

+ 15 - 1
Assets/Scripts/LayoutTemplate/TemplateText.cs

@@ -75,7 +75,21 @@ public class TemplateText : BaseTemPlate
         if(value.textContent.Contains("<br>"))
             value.textContent = value.textContent.Replace("<br>","\n");
 
-        
+
+        if (m_Text)
+        {
+            m_Text.text = value.textContent;
+            m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + value.TextBJ);
+        }
+        else
+        {
+
+            m_Canvas = transform.Find("Canvas").GetComponent<RectTransform>();
+            m_BG = transform.Find("Canvas/Image").GetComponent<Image>();
+            m_Text = transform.Find("Canvas/Text").GetComponent<Text>();
+            m_Text.text = value.textContent;
+            m_BG.sprite = ResMgr.Instance.Load<Sprite>("Template/Texture/文本框" + value.TextBJ);
+        }
 
     }
     string str;

+ 12 - 0
Assets/VuforiaLicense.cs

@@ -0,0 +1,12 @@
+
+            //This class is auto-generated, please do not overwrite
+
+            public class VuforiaLicense
+            {
+const string license = "QVZkYWlmci8vLy8vQUFBQm1UeHROL1pOMEVnK3V1SklPNGlCRDdkc3cyK3k3UEZrL1JUSkllSzU5MVBBUFpGSGpBMFlVWDJweWJpSERaayt4bTBmRnIydExDRFBPd01SOFMvd3hhanVWT1hVWURrR0E4Tmx6UWlOYlNmUXlGU0VGTFM5MlVOck9RTzBkbk13c1RuWktTMFZVaGsrWGg5Yll5NEl2N2xmUThmUHZHNi9EU1EvcWZTcm44SWJac1EzRGwyTW9tTjFWQU81WVBYU1F3akN5WThMbmN1Nlh3Slhmcnhab0R2QkprRERucDVOaVdobHFkaVlpL1pld2FKeXJoQUUxdEltRWtUS1I0QjRidTJWRTFuOHFhWENFRm1SR3RYMlNMWWlDY2h5bHhZWHpZbkY5RHdUbExPVnZZLzN2WG51SjhWUGhhVXRBTTh4SXJrMDcyWkw1bHZCblZKNTA4TEhDNXZ6eldKY0xCSThwRG1TOXA2QmNVMUQ=";
+
+                static string GetLicenseKey()
+                {
+                    return license;
+                }
+            }

+ 11 - 0
Assets/VuforiaLicense.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e2603f98423c45440af98897665d0ffa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: