lvjincheng 3 years ago
parent
commit
b03447a67f

+ 29 - 8
Assets/BowArrow/Resources/Prefabs/Views/AboutUsView.prefab

@@ -203,10 +203,10 @@ RectTransform:
   m_Father: {fileID: 1769368935106508370}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 384.5, y: -153}
-  m_SizeDelta: {x: 700, y: 171}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 384.5, y: 0}
+  m_SizeDelta: {x: 700, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1063587978277370484
 CanvasRenderer:
@@ -397,6 +397,7 @@ GameObject:
   - component: {fileID: 922558248670213767}
   - component: {fileID: 4543182971488187836}
   - component: {fileID: 2101910995631758790}
+  - component: {fileID: 4514381884900307547}
   m_Layer: 5
   m_Name: ComLogo
   m_TagString: Untagged
@@ -418,9 +419,9 @@ RectTransform:
   m_Father: {fileID: 1769368935106508370}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 384.5, y: -35}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 205, y: 78}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4543182971488187836
@@ -451,7 +452,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 15e3ea6a29828274cb6d5029a3283229, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -461,6 +462,26 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4514381884900307547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8305365854955050222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad5f01a2ce5341b478b03a4801e0fb78, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  languageImages:
+  - language: 1
+    sprite: {fileID: 21300000, guid: c01e2c82b91245c4baa0ddaab0da4a1d, type: 3}
+    size: {x: 293, y: 78}
+  - language: 0
+    sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
+    size: {x: 205, y: 78}
+  resetSize: 1
 --- !u!1 &8963406415416676015
 GameObject:
   m_ObjectHideFlags: 0

+ 111 - 90
Assets/BowArrow/Scenes/Entry.unity

@@ -347,81 +347,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!1 &128655522
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 128655523}
-  - component: {fileID: 128655525}
-  - component: {fileID: 128655524}
-  m_Layer: 5
-  m_Name: ComLogo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &128655523
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 128655522}
-  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: 1069934139}
-  m_RootOrder: 0
-  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: 0}
-  m_SizeDelta: {x: 410, y: 156}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &128655524
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 128655522}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d1ccdb461f541b14abc2db35d3037429, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &128655525
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 128655522}
-  m_CullTransparentMesh: 1
 --- !u!1 &730210588
 GameObject:
   m_ObjectHideFlags: 0
@@ -517,7 +442,7 @@ MonoBehaviour:
   m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!1 &1069934135
+--- !u!1 &968268855
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -525,10 +450,10 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1069934139}
-  - component: {fileID: 1069934138}
-  - component: {fileID: 1069934137}
-  - component: {fileID: 1069934136}
+  - component: {fileID: 968268859}
+  - component: {fileID: 968268858}
+  - component: {fileID: 968268857}
+  - component: {fileID: 968268856}
   m_Layer: 5
   m_Name: CanvasLogo
   m_TagString: Untagged
@@ -536,13 +461,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1069934136
+--- !u!114 &968268856
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1069934135}
+  m_GameObject: {fileID: 968268855}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -553,13 +478,13 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!114 &1069934137
+--- !u!114 &968268857
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1069934135}
+  m_GameObject: {fileID: 968268855}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -568,7 +493,7 @@ MonoBehaviour:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1230, y: 720}
+  m_ReferenceResolution: {x: 3000, y: 1680}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
@@ -576,13 +501,13 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
---- !u!223 &1069934138
+--- !u!223 &968268858
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1069934135}
+  m_GameObject: {fileID: 968268855}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 0
@@ -597,18 +522,18 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 1
   m_TargetDisplay: 0
---- !u!224 &1069934139
+--- !u!224 &968268859
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1069934135}
+  m_GameObject: {fileID: 968268855}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
-  - {fileID: 128655523}
+  - {fileID: 1693457930}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -843,6 +768,102 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1 &1693457929
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1693457930}
+  - component: {fileID: 1693457932}
+  - component: {fileID: 1693457931}
+  - component: {fileID: 1693457933}
+  m_Layer: 5
+  m_Name: ComLogo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1693457930
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693457929}
+  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: 968268859}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 1000, y: 380}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1693457931
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693457929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1693457932
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693457929}
+  m_CullTransparentMesh: 1
+--- !u!114 &1693457933
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693457929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad5f01a2ce5341b478b03a4801e0fb78, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  languageImages:
+  - language: 1
+    sprite: {fileID: 21300000, guid: c01e2c82b91245c4baa0ddaab0da4a1d, type: 3}
+    size: {x: 1422, y: 378}
+  - language: 0
+    sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
+    size: {x: 1000, y: 380}
+  resetSize: 1
 --- !u!1 &2060474345
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 7
Assets/BowArrow/Scenes/Login.unity

@@ -3840,7 +3840,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 35.215313, y: 0}
+  m_AnchoredPosition: {x: 36, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &355551584
@@ -6207,7 +6207,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 115.382774, y: 0}
+  m_AnchoredPosition: {x: 119, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -11209,7 +11209,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 246.69856, y: 0}
+  m_AnchoredPosition: {x: 256, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -11747,7 +11747,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 371.5311, y: 0}
+  m_AnchoredPosition: {x: 386, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -13568,6 +13568,7 @@ GameObject:
   - component: {fileID: 1829869216}
   - component: {fileID: 1829869218}
   - component: {fileID: 1829869217}
+  - component: {fileID: 1829869219}
   m_Layer: 5
   m_Name: ComLogo
   m_TagString: Untagged
@@ -13614,7 +13615,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 15e3ea6a29828274cb6d5029a3283229, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -13632,6 +13633,26 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1829869215}
   m_CullTransparentMesh: 1
+--- !u!114 &1829869219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1829869215}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ad5f01a2ce5341b478b03a4801e0fb78, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  languageImages:
+  - language: 1
+    sprite: {fileID: 21300000, guid: c01e2c82b91245c4baa0ddaab0da4a1d, type: 3}
+    size: {x: 293, y: 78}
+  - language: 0
+    sprite: {fileID: 21300000, guid: ea55a3c75079cf4429cf9a4866a5ffed, type: 3}
+    size: {x: 205, y: 78}
+  resetSize: 1
 --- !u!1 &1831635680
 GameObject:
   m_ObjectHideFlags: 0
@@ -13881,7 +13902,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 113.30144, y: 0}
+  m_AnchoredPosition: {x: 116, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1847328316
@@ -14367,7 +14388,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 309.11484, y: 0}
+  m_AnchoredPosition: {x: 321, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359

+ 1 - 0
Assets/BowArrow/Scripts/CommonConfig.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 /**通用配置(2021/12/18新增) */
 public class CommonConfig
 {
+    public static bool ReleaseVersion2 = true;
     /*
         特定版本功能
         1、长接瞄准键,出来鼠标的功能帮忙去掉

+ 14 - 5
Assets/BowArrow/Scripts/Components/ImageAutoLanguage.cs

@@ -8,6 +8,7 @@ public class ImageAutoLanguage : MonoBehaviour
     static LanguageEnum currentLanguageEnum = LanguageEnum.Chinese;
     static HashSet<ImageAutoLanguage> imageAutoLanguages = new HashSet<ImageAutoLanguage>();
     [SerializeField] LanguageImage[] languageImages = {};
+    [SerializeField] bool resetSize;
 
     private static bool inited = false;
     public static void Init()
@@ -55,18 +56,25 @@ public class ImageAutoLanguage : MonoBehaviour
     public void ApplyToImage()
     {
         Image imageComp = GetComponent<Image>();
-        bool matched = false;
+        LanguageImage matchRes = null;
         foreach (var languageImage in languageImages)
         {
             if (languageImage.language == currentLanguageEnum) 
             {
-                matched = true;
-                imageComp.sprite = languageImage.sprite;
+                matchRes = languageImage;
                 break;
             }
         }
-        if (!matched && languageImages.Length > 0) {
-            imageComp.sprite = languageImages[0].sprite;
+        if (matchRes == null && languageImages.Length > 0) {
+            matchRes = languageImages[0];
+        }
+        if (matchRes != null) {
+            imageComp.sprite = matchRes.sprite;
+            if (resetSize) {
+                JC.Unity.UI.RectTransformUtils.SetRectTransformSize(
+                    imageComp.transform as RectTransform, matchRes.size
+                );
+            }
         }
     }
 }
@@ -74,4 +82,5 @@ public class ImageAutoLanguage : MonoBehaviour
 public class LanguageImage {
     public LanguageEnum language;
     public Sprite sprite;
+    public Vector2 size;
 }

+ 1 - 1
Assets/BowArrow/Scripts/Components/TextAutoLanguage.cs

@@ -148,7 +148,7 @@ class LanguageDefault {
     public string text36 = "新 密 码 :";
     public string text37 = "确认密码 :";
     public string text38 = "获取";
-    public string text39 = "账号";
+    public string text39 = "账 号";
     public string text40 = "手机号";
     public string text41 = "请输入账号";
     public string text42 = "请输入密码";

+ 1 - 0
Assets/BowArrow/Scripts/Entry.cs

@@ -126,6 +126,7 @@ public class Entry : MonoBehaviour
     string countStr2 = "";
     void OnGUI()  
     {  
+        if (CommonConfig.ReleaseVersion2) return;
         GUIStyle labelFont = new GUIStyle();
         labelFont.normal.textColor = new Color(1, 0.6f, 0.6f); 
         labelFont.fontSize = 40; 

+ 5 - 0
Assets/BowArrow/Scripts/View/TopBarView.cs

@@ -32,6 +32,11 @@ public class TopBarView : MonoBehaviour
                 }
             }
         }
+        if (CommonConfig.ReleaseVersion2) {
+            Transform diamond = transform.Find("TopBar/Item");
+            diamond.localPosition += Vector3.right * 87;
+            transform.Find("TopBar/IconLebo").gameObject.SetActive(false);
+        }
     }
 
     void Update()

BIN
Assets/BowArrow/Textures/Common/ComLogo_cn.png


+ 1 - 1
Assets/BowArrow/Textures/Login/ComLogo.png.meta → Assets/BowArrow/Textures/Common/ComLogo_cn.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15e3ea6a29828274cb6d5029a3283229
+guid: ea55a3c75079cf4429cf9a4866a5ffed
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
Assets/BowArrow/Textures/Common/ComLogo_en.png


+ 1 - 1
Assets/BowArrow/Textures/Login/ComLogo_x2.png.meta → Assets/BowArrow/Textures/Common/ComLogo_en.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d1ccdb461f541b14abc2db35d3037429
+guid: c01e2c82b91245c4baa0ddaab0da4a1d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
Assets/BowArrow/Textures/Login/ComLogo.png


BIN
Assets/BowArrow/Textures/Login/ComLogo_x2.png


+ 7 - 0
Assets/JC/Untiy/UI/BackgroundAdapter.cs

@@ -32,6 +32,13 @@ namespace JC.Unity.UI {
             Vector3 deltaPos = sizeInScreen * deltaPivot;
             return rectTransform.position + deltaPos;
         }
+        public static void SetRectTransformSize(RectTransform trans, Vector2 newSize)
+        {
+            Vector2 oldSize = trans.rect.size;
+            Vector2 deltaSize = newSize - oldSize;
+            trans.offsetMin = trans.offsetMin - new Vector2(deltaSize.x * trans.pivot.x, deltaSize.y * trans.pivot.y);
+            trans.offsetMax = trans.offsetMax + new Vector2(deltaSize.x * (1f - trans.pivot.x), deltaSize.y * (1f - trans.pivot.y));
+        }
     }   
     public class CanvasUtils
     {