CHIVA\bj 5 months ago
parent
commit
f81c1fbf82

+ 1 - 1
ModeDisplay/Assets/GameAssets/15.LineRenderer/Small.mat

@@ -55,7 +55,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 76b293ce6c463144aa5d643127dd77f4, type: 3}
         m_Scale: {x: 0.5, y: 0.125}
-        m_Offset: {x: 0, y: 0.5}
+        m_Offset: {x: 0.5, y: 0.125}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 3 - 3
ModeDisplay/Assets/QFrameworkData/QAssets.cs

@@ -21,10 +21,10 @@ namespace QAssetBundle
         public const string BundleName = "partlistpanel_prefab";
         public const string PARTLISTPANEL = "partlistpanel";
     }
-    public class Pc_operatepanel_prefab
+    public class Principlepanel_prefab
     {
-        public const string BundleName = "pc_operatepanel_prefab";
-        public const string PC_OPERATEPANEL = "pc_operatepanel";
+        public const string BundleName = "principlepanel_prefab";
+        public const string PRINCIPLEPANEL = "principlepanel";
     }
     public class Subtitlespanel_prefab
     {

+ 2 - 2
ModeDisplay/Assets/Scenes/运行原理/机械联动特性/10kV真空断路器-机械联动特性.unity

@@ -27557,7 +27557,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 31e72f2d15011704b9b96f198ebb351c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2b24323009008bf4ab793c7df7b0004e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -28087,7 +28087,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &795352508
 RectTransform:
   m_ObjectHideFlags: 0

+ 5 - 1
ModeDisplay/Assets/Scripts/PrincipleGameLanuch.cs

@@ -36,7 +36,11 @@ public class PrincipleGameLanuch : MonoBehaviour
             OnBtnClick(m_PrincipleInfos[0]);
         }
 
-        m_CloseBtn.onClick.AddListener(() => Application.Quit());
+        if (m_CloseBtn != null)
+        {
+            m_CloseBtn.onClick.AddListener(() => Application.Quit());
+        }
+
     }
 
     private void OnBtnClick(PrincipleInfo principleInfo)

+ 5 - 2
ModeDisplay/Assets/Scripts/PrincipleGameLanuch_ExtraDirector.cs

@@ -25,7 +25,7 @@ public class PrincipleGameLanuch_ExtraDirector : MonoBehaviour
         {
             if (principleInfo.btn != null)
             {
-                principleInfo.btn.onClick.AddListener( () => OnBtnClick(principleInfo));
+                principleInfo.btn.onClick.AddListener(() => OnBtnClick(principleInfo));
             }
         }
 
@@ -34,7 +34,10 @@ public class PrincipleGameLanuch_ExtraDirector : MonoBehaviour
             OnBtnClick(m_PrincipleInfos[0]);
         }
 
-        m_CloseBtn.onClick.AddListener(() => Application.Quit());
+        if (m_CloseBtn != null)
+        {
+            m_CloseBtn.onClick.AddListener(() => Application.Quit());
+        }
     }
 
     private void OnBtnClick(PrincipleInfo_Extra principleInfo)

+ 8 - 0
ModeDisplay/Assets/StreamingAssets/AssetBundles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e0e66e7a14846604d91e2c0fa740482b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: