更新同步

Assets/ArtRes/Models/Materials/fa 1.mat

@@ -178,3 +178,16 @@ Material:
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &3759716682144580158
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5

Assets/HQB/Scene/10002_2002_03_OfficeScene.unity

@@ -176,7 +176,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1660739062635597432, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
       propertyPath: m_Name
@@ -184,15 +184,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 2884319168972385861, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 3057514198336764871, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
@@ -641,6 +641,37 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: -1160307367571568844, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!1 &1037398674
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1037398675}
+  m_Layer: 12
+  m_Name: "\u4E2D\u5FC3\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1037398675
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1037398674}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0, z: 1.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 136924460}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1181419320
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -674,6 +705,37 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 1268371127622009216, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!1 &1505325484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1505325485}
+  m_Layer: 12
+  m_Name: "\u4E2D\u5FC3\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1505325485
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1505325484}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1.1999971}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1882503365}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1524523184
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -700,6 +762,7 @@ GameObject:
   - component: {fileID: 1567901897}
   - component: {fileID: 1567901896}
   - component: {fileID: 1567901895}
+  - component: {fileID: 1567901899}
   m_Layer: 0
   m_Name: Camera_Disease
   m_TagString: Untagged
@@ -779,9 +842,9 @@ Camera:
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 2048
+    m_Bits: 4096
   m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
+  m_TargetTexture: {fileID: 8400000, guid: 76c94c4c4c4548a4c9cbc8d1ea0c1236, type: 2}
   m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 1
@@ -806,6 +869,35 @@ Transform:
   m_Father: {fileID: 1966461577}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1567901899
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1567901894}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b467eb831b91cc4ab123ece8292e9a1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 1037398675}
+  distance: 5
+  xSpeed: 10
+  ySpeed: 10
+  scrollSpeed: 1
+  yMinLimit: -20
+  yMaxLimit: 80
+  distanceMin: 0.5
+  distanceMax: 15
+  smoothTime: 2
+  rotationYAxis: 0
+  rotationXAxis: 0
+  velocityX: 0
+  velocityY: 0
+  limit: 0
+  initPos: {x: 0, y: 0, z: 0}
+  initRot: {x: 0, y: 0, z: 0}
 --- !u!64 &1635360163
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1140,6 +1232,7 @@ GameObject:
   - component: {fileID: 1902030984}
   - component: {fileID: 1902030983}
   - component: {fileID: 1902030982}
+  - component: {fileID: 1902030986}
   m_Layer: 0
   m_Name: Camera_Normal
   m_TagString: Untagged
@@ -1221,7 +1314,7 @@ Camera:
     serializedVersion: 2
     m_Bits: 2048
   m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
+  m_TargetTexture: {fileID: 8400000, guid: fb2169cf27c4ec54aa65469ee996e57a, type: 2}
   m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 1
@@ -1246,6 +1339,35 @@ Transform:
   m_Father: {fileID: 1966461577}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1902030986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1902030981}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d8c265c4ff73a740a73377f69fc474e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 1505325485}
+  distance: 5
+  xSpeed: 10
+  ySpeed: 10
+  scrollSpeed: 1
+  yMinLimit: -20
+  yMaxLimit: 80
+  distanceMin: 0.5
+  distanceMax: 15
+  smoothTime: 2
+  rotationYAxis: 0
+  rotationXAxis: 0
+  velocityX: 0
+  velocityY: 0
+  limit: 0
+  initPos: {x: 0, y: 0, z: 0}
+  initRot: {x: 0, y: 0, z: 0}
 --- !u!64 &1952885506
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1275,7 +1397,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1966461577
 Transform:
   m_ObjectHideFlags: 0

Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab

@@ -269,7 +269,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3213127863992522820}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4512a1fb2a67f084dad0e6f502abcae4, type: 3}
+  m_Script: {fileID: 11500000, guid: 39a57370865ba71489611c8402e8de4f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   rawImage: {fileID: 0}

Assets/Scripts/Project/Objects/Device.meta

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

Assets/Scripts/Project/Objects/Materials.meta

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

Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs

@@ -1,40 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using TMPro;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-public class UI_GraphicRextualPanel : BasePanel
-{
-    public RawImage rawImage;
-
-    //¶¥²¿ÎÄ×Ö
-    public TextMeshProUGUI ToptextMeshProUGUI;
-
-    //ÄÚÈÝ
-    public TextMeshProUGUI ContentTextMeshProUGUI;
-
-    protected override void Awake()
-    {
-        base.Awake();
-    }
-    public override void ShowMe()
-    {
-        base.ShowMe();
-    }
-    public override void HideMe()
-    {
-        base.HideMe();
-    }
-    protected override void OnClick(string btnName)
-    {
-        switch (btnName)
-        {
-            case "returnBtn":
-                //Bootstrap.Instance.uiManager.HidePanel<UI_GraphicRextualPanel>();
-                //LiveSceneManger.Instance.TipBtn.gameObject.SetActive(true);
-                break;
-        }
-    }
-}

Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs.meta

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

Assets/StreamingAssets/start.ini

@@ -1 +1 @@
-0
+1