ZengXingxing преди 1 година
родител
ревизия
6afcfbeb68

Файловите разлики са ограничени, защото са твърде много
+ 0 - 24
SFGgouhuo/Assembly-CSharp-Editor-firstpass.csproj


Файловите разлики са ограничени, защото са твърде много
+ 0 - 24
SFGgouhuo/Assembly-CSharp-firstpass.csproj


+ 30 - 241
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLogin.prefab

@@ -1,242 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &278466904498847844
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2093648987750763901}
-  - component: {fileID: 1047348076510364755}
-  - component: {fileID: 2657594930263526150}
-  - component: {fileID: -8205964566705165525}
-  m_Layer: 5
-  m_Name: lan_testImg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2093648987750763901
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278466904498847844}
-  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: 3543098821856029668}
-  m_RootOrder: 2
-  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: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1047348076510364755
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278466904498847844}
-  m_CullTransparentMesh: 1
---- !u!114 &2657594930263526150
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278466904498847844}
-  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: 0}
-  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!114 &-8205964566705165525
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278466904498847844}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  configName: testImg
---- !u!1 &485521865807969154
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2871543055718883166}
-  - component: {fileID: 1178969548434723884}
-  - component: {fileID: 2769134045808016578}
-  - component: {fileID: 4395692917795557069}
-  m_Layer: 5
-  m_Name: lan_test
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2871543055718883166
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 485521865807969154}
-  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: 3543098821856029668}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1178969548434723884
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 485521865807969154}
-  m_CullTransparentMesh: 1
---- !u!114 &2769134045808016578
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 485521865807969154}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!114 &4395692917795557069
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 485521865807969154}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  configName: test
 --- !u!1 &1384016074312052176
 GameObject:
   m_ObjectHideFlags: 0
@@ -248,8 +11,9 @@ GameObject:
   - component: {fileID: 3184106305730477855}
   - component: {fileID: 1995392710287868882}
   - component: {fileID: 4161317494527206809}
+  - component: {fileID: -2198268478495679029}
   m_Layer: 5
-  m_Name: Text (TMP)
+  m_Name: lan_Confirm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -371,6 +135,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &-2198268478495679029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384016074312052176}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  configName: Confirm
 --- !u!1 &2161994005121839736
 GameObject:
   m_ObjectHideFlags: 0
@@ -535,8 +312,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1554852150603331998}
-  - {fileID: 2871543055718883166}
-  - {fileID: 2093648987750763901}
   m_Father: {fileID: 8636962958587706246}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1111,8 +886,9 @@ GameObject:
   - component: {fileID: 1182406225665168388}
   - component: {fileID: 8377760830304398263}
   - component: {fileID: 3010266277166278578}
+  - component: {fileID: 1165699996102880716}
   m_Layer: 5
-  m_Name: Notice
+  m_Name: lan_InviteCode
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1234,6 +1010,19 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1165699996102880716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7124772789589831140}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  configName: InviteCode
 --- !u!1 &8347018673477348233
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 2
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/ESLanguage.prefab

@@ -1050,7 +1050,7 @@ GameObject:
   - component: {fileID: 584302982629949801}
   - component: {fileID: 3758946663200780612}
   m_Layer: 5
-  m_Name: lan_
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1187,7 +1187,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2103750614914632249
 RectTransform:
   m_ObjectHideFlags: 0

+ 3 - 1
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatchManager.cs

@@ -51,8 +51,10 @@ public class LanguageMatchManager : MonoBehaviour
 
     public void RefreshLanguage(int _lan)
     {
+
         int lan = (int)_lan;
-        if (languageType == lan) return;
+        if (languageType == lan) return;
+        PlayerPrefs.SetInt("CurLanguage", _lan);
         languageType = lan;
         foreach (var item in listlanguageMatch)
         {

BIN
SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx


+ 24 - 0
SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -37,3 +37,27 @@ MonoBehaviour:
       languageType: 4
     - content: 
       languageType: 5
+  - name: Confirm
+    content:
+    - content: Confirm
+      languageType: 1
+    - content: "\u786E\u8BA4"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: InviteCode
+    content:
+    - content: Invite Code
+      languageType: 1
+    - content: "\u9080\u8BF7\u7801"
+      languageType: 2
+    - content: 
+      languageType: 3
+    - content: 
+      languageType: 4
+    - content: 
+      languageType: 5

+ 4 - 2
SFGgouhuo/Assets/Scripts/UI/Loading/ESLanguage.cs

@@ -43,12 +43,14 @@ public class ESLanguage : BasePanel
                 toggles[index].transform.Find("On").gameObject.SetActive(isOn);
                 if (isOn)
                 {
-                    language = (Language)index;
+                    LanguageMatchManager.Instance.RefreshLanguage(index);
+                    Debug.Log((int)LanguageMatchManager.Instance.GetCurLanType());
+
                 }
                 OnLanguageChanged(toggles[index]);
             });
         }
-        toggles[(int)language].isOn = true;
+        toggles[(int)LanguageMatchManager.Instance.GetCurLanType()].isOn = true;
     }
     void OnLanguageChanged(Toggle toggle)
     {

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
SFGgouhuo/Assets/TextMesh Pro/Fonts/Alimama_ShuHeiTi_Bold SDF.asset


Файловите разлики са ограничени, защото са твърде много
+ 0 - 24
SFGgouhuo/BakeryEditorAssembly.csproj


Файловите разлики са ограничени, защото са твърде много
+ 0 - 24
SFGgouhuo/BakeryRuntimeAssembly.csproj


Някои файлове не бяха показани, защото твърде много файлове са промени