From 8d2533b7ab94611a99a0fefb6b0a5a6e4b4a3eff Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期四, 02 八月 2018 16:59:14 +0800
Subject: [PATCH] Merge branch 'leonard'
---
/dev/null | 9 ---------
UI/HUD/FacingCamera.cs | 9 +++------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta b/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta
deleted file mode 100644
index ee95432..0000000
--- a/Core/NetworkPackage/ClientPack/ClientToMapServer/A3_Item.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d4bbed9a14bff5e48b2bdd4df9dd3485
-folderAsset: yes
-timeCreated: 1501209136
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/UI/HUD/FacingCamera.cs b/UI/HUD/FacingCamera.cs
index dd27f88..08297b9 100644
--- a/UI/HUD/FacingCamera.cs
+++ b/UI/HUD/FacingCamera.cs
@@ -8,14 +8,11 @@
[SerializeField]
Camera m_Camera;
- public new Camera camera
- {
- get
- {
+ public new Camera camera {
+ get {
return m_Camera;
}
- set
- {
+ set {
m_Camera = value;
}
}
--
Gitblit v1.8.0