修改

c3882b23 · zxhljwl · ea505f86 · c3882b23 · ea505f86 · c3882b23
Commit c3882b23 authored May 14, 2021 by zxhljwl
5 changed files
--- a/Assets/Game/Main/Prefabs/WxLogin.prefab
+++ b/Assets/Game/Main/Prefabs/WxLogin.prefab
@@ -26,16 +26,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3237190206908489591}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3237190208110048569}
+  m_Father: {fileID: 3563345472001913625}
-  m_RootOrder: 5
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 115.35, y: 61.599976}
+  m_AnchoredPosition: {x: 110, y: -413}
  m_SizeDelta: {x: 147.79895, y: 67.246895}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3237190206908489592
@@ -59,7 +59,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.77254903, g: 0.40392157, b: 0.14901961, a: 1}
+  m_Color: {r: 1, g: 0.94509804, b: 0.043137256, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -75,8 +75,8 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u300A\u9690\u79C1\u653F\u7B56\u300B"
 --- !u!114 &3237190206908489595
@@ -159,16 +159,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3237190206965247027}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3237190208110048569}
+  m_Father: {fileID: 3563345472001913625}
-  m_RootOrder: 4
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -53.74, y: 61.6}
+  m_AnchoredPosition: {x: -47, y: -413}
  m_SizeDelta: {x: 145.00415, y: 67.246895}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3237190206965247028
@@ -192,7 +192,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.77254903, g: 0.40392157, b: 0.14901961, a: 1}
+  m_Color: {r: 1, g: 0.94509804, b: 0.043137256, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -200,7 +200,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 26
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 2
@@ -208,8 +208,8 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u300A\u7528\u6237\u534F\u8BAE\u300B"
 --- !u!114 &3237190206965247031
@@ -283,7 +283,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3237190207061334652
 RectTransform:
  m_ObjectHideFlags: 0
@@ -374,7 +374,7 @@ RectTransform:
  m_LocalScale: {x: 0.2, y: 0.2, z: 1}
  m_Children: []
  m_Father: {fileID: 3237190208110048569}
-  m_RootOrder: 6
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -453,7 +453,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 325}
-  m_SizeDelta: {x: 303, y: 312}
+  m_SizeDelta: {x: 685, y: 447}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3237190207470050450
 CanvasRenderer:
@@ -517,16 +517,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3237190207866716766}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 3237190208110048569}
+  m_Father: {fileID: 3563345472001913625}
-  m_RootOrder: 3
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -29.5, y: 61.599976}
+  m_AnchoredPosition: {x: -29.5, y: -414}
  m_SizeDelta: {x: 536.29065, y: 67.246895}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3237190207866716739
@@ -550,7 +550,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.49803922, g: 0.28627452, b: 0.09019608, a: 1}
+  m_Color: {r: 0.2, g: 0.2, b: 0.2, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
@@ -558,7 +558,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 26
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 2
@@ -566,8 +566,8 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u767B\u5F55\u5373\u540C\u610F\t                  \u548C\t                  "
 --- !u!1 &3237190208110048566
@@ -602,10 +602,8 @@ RectTransform:
  - {fileID: 3237190207470050448}
  - {fileID: 3237190208923896545}
  - {fileID: 3237190207061334652}
-  - {fileID: 3237190207866716737}
-  - {fileID: 3237190206965247026}
-  - {fileID: 3237190206908489590}
  - {fileID: 3237190207161016756}
+  - {fileID: 3563345472001913625}
  m_Father: {fileID: 3237190208549846632}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -800,7 +798,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -18}
+  m_AnchoredPosition: {x: 0, y: -332}
  m_SizeDelta: {x: 494, y: 103}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3237190208923896547
@@ -894,3 +892,41 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
+--- !u!1 &7998537269366727135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3563345472001913625}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3563345472001913625
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7998537269366727135}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3237190207866716737}
+  - {fileID: 3237190206965247026}
+  - {fileID: 3237190206908489590}
+  m_Father: {fileID: 3237190208110048569}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 37, y: 49}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Game/Main/Resource/Dialog/wx_login_bg.png
+++ b/Assets/Game/Main/Resource/Dialog/wx_login_bg.png
--- a/Assets/Game/Main/Resource/Dialog/wx_login_btn.png
+++ b/Assets/Game/Main/Resource/Dialog/wx_login_btn.png
--- a/Assets/Game/Main/Resource/Dialog/wx_login_icon.png
+++ b/Assets/Game/Main/Resource/Dialog/wx_login_icon.png
--- a/Assets/Game/Main/Scenes/CrazyCar.unity
+++ b/Assets/Game/Main/Scenes/CrazyCar.unity
@@ -9128,10 +9128,10 @@ RectTransform:
  m_Father: {fileID: 300181109}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 93.36, y: -45.84}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 126.72, y: 31.68}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &409306806
 MonoBehaviour:
@@ -23178,7 +23178,7 @@ PrefabInstance:
    - target: {fileID: 2853166085728200632, guid: 1053be02c113a7a45adf322c929b0cb6,
        type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
        type: 3}
@@ -23188,7 +23188,7 @@ PrefabInstance:
    - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
        type: 3}
      propertyPath: IS_TGYZ
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2853166085728200635, guid: 1053be02c113a7a45adf322c929b0cb6,
        type: 3}
@@ -29550,6 +29550,7 @@ GameObject:
  - component: {fileID: 1405575441}
  - component: {fileID: 1405575443}
  - component: {fileID: 1405575442}
+  - component: {fileID: 1405575444}
  m_Layer: 5
  m_Name: close
  m_TagString: Untagged
@@ -29613,6 +29614,60 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1405575440}
  m_CullTransparentMesh: 0
+--- !u!114 &1405575444
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1405575440}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1405575442}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2052625161}
+        m_MethodName: closeProtectionCoverDialog
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &1405949354
 GameObject:
  m_ObjectHideFlags: 0
@@ -37433,10 +37488,10 @@ RectTransform:
  m_Father: {fileID: 300181109}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 30, y: -97.04}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.720001}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1853878469
 MonoBehaviour: