up

2020-07-09 08:50:24 +08:00
parent 13d25f4707
commit c523462b82
1818 changed files with 174940 additions and 582 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab
@@ -473,7 +473,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 8.166667
+  aspectRatio: 0.33333334
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -538,7 +538,6 @@ Transform:
  - {fileID: 4098723856805998}
  - {fileID: 4525616215859032}
  - {fileID: 223460704660280301}
-  - {fileID: 1710183414717688058}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -579,7 +578,7 @@ MonoBehaviour:
  anchorOffset: 0
  softBorderPadding: 1
  renderQueue: 0
-  startingRenderQueue: 3000
+  startingRenderQueue: 3004
  mClipTexture: {fileID: 0}
  mAlpha: 1
  mClipping: 0
@@ -871,8 +870,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 4525616215859032}
-  - component: {fileID: 114607865143906456}
  - component: {fileID: 65202051437322874}
+  - component: {fileID: 7518167786723604769}
  m_Layer: 5
  m_Name: SpriteBg
  m_TagString: Untagged
@@ -894,7 +893,20 @@ Transform:
  m_Father: {fileID: 4228491702010106}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114607865143906456
+--- !u!65 &65202051437322874
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1732686224483064}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2304, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7518167786723604769
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -903,7 +915,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 1732686224483064}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
@@ -928,38 +940,10 @@ MonoBehaviour:
  mWidth: 1125
  mHeight: 2304
  mDepth: 0
-  autoResizeBoxCollider: 1
+  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
  aspectRatio: 0.48828125
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  atlasName: EmptyAtlas
-  mAtlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
-  mSpriteName: public__empty
-  mFillCenter: 1
-  isGrayMode: 0
--- !u!65 &65202051437322874
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1732686224483064}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1125, y: 2304, z: 0}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1742139874857112
 GameObject:
  m_ObjectHideFlags: 0
@@ -1201,7 +1185,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 9.45
+  aspectRatio: 9.25
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -1233,96 +1217,6 @@ MonoBehaviour:
  isAppendEndingString: 0
  AppendString: '...'
  fontName: EmptyFont
--- !u!1 &2890645277124195841
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1710183414717688058}
-  - component: {fileID: 8236808463385616414}
-  m_Layer: 5
-  m_Name: TextureLogo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1710183414717688058
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2890645277124195841}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 515.24994, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4228491702010106}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8236808463385616414
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2890645277124195841}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 1}
-  mPivot: 4
-  mWidth: 512
-  mHeight: 336
-  mDepth: 2
-  autoResizeBoxCollider: 0
-  hideIfOffScreen: 0
-  keepAspectRatio: 0
-  aspectRatio: 1.5238096
-  mType: 0
-  mFillDirection: 4
-  mFillAmount: 1
-  mInvert: 0
-  mFlip: 0
-  centerType: 1
-  leftType: 1
-  rightType: 1
-  bottomType: 1
-  topType: 1
-  mRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  mTexture: {fileID: 2800000, guid: 7d375a44ac80b455d944039beb4acab6, type: 3}
-  mMat: {fileID: 0}
-  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
-  mBorder: {x: 0, y: 0, z: 0, w: 0}
-  mFixedAspect: 0
 --- !u!1 &5670893069891110169
 GameObject:
  m_ObjectHideFlags: 0
@@ -1392,7 +1286,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 13.2
+  aspectRatio: 4.1555557
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}