Merge branch 'main' of http://139.155.244.27:822/LSR/gouhuo

.gitignore

@@ -24,6 +24,7 @@ SFGgouhuo/Assembly-CSharp-firstpass.csproj
 SFGgouhuo/BakeryEditorAssembly.csproj
 SFGgouhuo/BakeryRuntimeAssembly.csproj
 SFGgouhuo/Project/
+SFGgouhuo/Assets/TextMesh Pro/Fonts/SOURCEHANSANSCN-BOLD SDF.asset
 SFGgouhuo/Assembly-CSharp.Player.csproj
 SFGgouhuo/Assembly-CSharp-firstpass.Player.csproj
 SFGgouhuo/BakeryRuntimeAssembly.Player.csproj

SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/ESLanguage.prefab

@@ -25,16 +25,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 243409191521088834}
-  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: 6573937260757435309}
-  m_RootOrder: 1
+  m_Father: {fileID: 9136654282189244300}
+  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: -22.4, y: 0}
+  m_AnchoredPosition: {x: 34.199974, y: 0}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5922554187398433606
@@ -239,7 +239,7 @@ RectTransform:
   - {fileID: 7652847006237471285}
   - {fileID: 995693847813613168}
   m_Father: {fileID: 6573937260757435309}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -350,11 +350,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3155156096499854735}
   - {fileID: 5036477530689358280}
   - {fileID: 5554496079357600200}
   m_Father: {fileID: 1435332481416965747}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -657,7 +656,7 @@ RectTransform:
   - {fileID: 9216910938467475645}
   - {fileID: 4608211541873644456}
   m_Father: {fileID: 1884959586076746665}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -769,12 +768,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1884959586076746665}
-  m_RootOrder: 0
+  m_Father: {fileID: 9136654282189244300}
+  m_RootOrder: 1
   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: -40.6, y: 0.0000023246}
+  m_AnchoredPosition: {x: -88.00002, y: 0}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &12177067995198337
@@ -845,7 +844,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1435332481416965747}
-  m_RootOrder: 2
+  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}
@@ -920,10 +919,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5115083755828748334}
-  - {fileID: 5227255099420467235}
   - {fileID: 8659688983455605753}
   m_Father: {fileID: 1435332481416965747}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -1061,6 +1059,43 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7617640738471222020
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9136654282189244300}
+  m_Layer: 5
+  m_Name: TabIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9136654282189244300
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7617640738471222020}
+  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: 5227255099420467235}
+  - {fileID: 3155156096499854735}
+  m_Father: {fileID: 1435332481416965747}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7953389324676550519
 GameObject:
   m_ObjectHideFlags: 0
@@ -1226,6 +1261,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 9136654282189244300}
   - {fileID: 1884959586076746665}
   - {fileID: 6573937260757435309}
   - {fileID: 1968229162962811236}
@@ -1300,6 +1336,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5cdcc656db75b444fa573669179614ac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  tabIcon: {fileID: 7617640738471222020}
 --- !u!1 &8363363319447052870
 GameObject:
   m_ObjectHideFlags: 0
@@ -1330,7 +1367,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1884959586076746665}
-  m_RootOrder: 1
+  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}

SFGgouhuo/Assets/Scripts/UI/Component/MainPanel.cs

@@ -76,11 +76,13 @@ public class MainPanel : BasePanel
 
     public override void OnDestroyWindow() { }
 
-    public override void OnInitWindow() {}
+    public override void OnInitWindow()
+    {
+        HashText.text = "ID: " + StepManager.userID;
+    }
 
     public override void OnShowWindow()
     {
-        //HashText.text = "ID: " + StepManager.userID;
         BagButtonBG.GetComponent<BagButtonChangeUI>().ResetUI();
         GuideButton.GetComponent<GuideButtonChangeUI>().ResetUI();
     }

SFGgouhuo/Assets/Scripts/UI/Loading/ESLanguage.cs

@@ -6,12 +6,18 @@ using UnityEngine.UI;
 
 public class ESLanguage : MonoBehaviour
 {
+    public GameObject tabIcon;
     private Toggle[] Toggles;
     private void Awake()
     {
         LanguageSwtich();
         Toggles = transform.GetComponentsInChildren<Toggle>();
-
+#if UNITY_STANDALONE_WIN
+        tabIcon.SetActive(true);
+#elif UNITY_ANDROID
+        tabIcon.SetActive(false)
+#elif UNITY_WEBGL
+#endif
     }
     void Update()
     {