From 65aa6fa7736d63263dbd3a20366fda54095eef1c Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期三, 28 十一月 2018 10:42:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/E_tongyong/E_qiandao/Effect_BuQian.prefab | 70 -----------------------------------
1 files changed, 0 insertions(+), 70 deletions(-)
diff --git a/Effects/UI/E_tongyong/BuQian/Effect_BuQian.prefab b/Effects/UI/E_tongyong/E_qiandao/Effect_BuQian.prefab
similarity index 81%
rename from Effects/UI/E_tongyong/BuQian/Effect_BuQian.prefab
rename to Effects/UI/E_tongyong/E_qiandao/Effect_BuQian.prefab
index 92d5e44..03666f7 100644
--- a/Effects/UI/E_tongyong/BuQian/Effect_BuQian.prefab
+++ b/Effects/UI/E_tongyong/E_qiandao/Effect_BuQian.prefab
@@ -11,23 +11,6 @@
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1599235319545506}
m_IsPrefabParent: 1
---- !u!1 &1223663771259214
-GameObject:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4132370133064326}
- - component: {fileID: 33442653889243908}
- - component: {fileID: 23742704813082150}
- m_Layer: 5
- m_Name: d
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &1278546421533548
GameObject:
m_ObjectHideFlags: 0
@@ -110,19 +93,6 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &4132370133064326
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1223663771259214}
- m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 26, y: -23.2, z: 0}
- m_LocalScale: {x: 23.00366, y: 23.00366, z: 23.00366}
- m_Children: []
- m_Father: {fileID: 224872051053241774}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!4 &4327534855608568
Transform:
m_ObjectHideFlags: 1
@@ -226,38 +196,6 @@
m_SortingLayerID: -117431673
m_SortingLayer: 1
m_SortingOrder: 10000
---- !u!23 &23742704813082150
-MeshRenderer:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1223663771259214}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 0
- m_ReflectionProbeUsage: 0
- m_Materials:
- - {fileID: 2100000, guid: 23b18c617c807484a9662f7b5bd0006a, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: -117431673
- m_SortingLayer: 1
- m_SortingOrder: 10000
--- !u!23 &23989090219145902
MeshRenderer:
m_ObjectHideFlags: 1
@@ -304,13 +242,6 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1369408843385514}
m_Mesh: {fileID: 4300000, guid: 2459603140b843e44b2fd45e19e9d8cd, type: 3}
---- !u!33 &33442653889243908
-MeshFilter:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1223663771259214}
- m_Mesh: {fileID: 4300000, guid: 8d956ab8e9019064f98fb0744da701f2, type: 3}
--- !u!33 &33759944879090020
MeshFilter:
m_ObjectHideFlags: 1
@@ -367,7 +298,6 @@
- {fileID: 4503734014923968}
- {fileID: 4327534855608568}
- {fileID: 4869656332921134}
- - {fileID: 4132370133064326}
m_Father: {fileID: 224298591968330252}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--
Gitblit v1.8.0