ZXW 1 year ago
parent
commit
9cad271310
45 changed files with 1562 additions and 36 deletions
  1. 2 6
      SFGgouhuo/Assembly-CSharp-Editor-firstpass.csproj
  2. 1 6
      SFGgouhuo/Assembly-CSharp-firstpass.csproj
  3. 8 0
      SFGgouhuo/Assets/Bundles/UI/Image/lan.meta
  4. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg.jpg
  5. 121 0
      SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg.jpg.meta
  6. BIN
      SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg1.jpg
  7. 121 0
      SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg1.jpg.meta
  8. 239 0
      SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLogin.prefab
  9. 1 5
      SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/ESNickName.prefab
  10. 1 5
      SFGgouhuo/Assets/Bundles/UI/Prefab/Item/Item_TypeFilter.prefab
  11. 8 0
      SFGgouhuo/Assets/Config.meta
  12. 8 0
      SFGgouhuo/Assets/Config/Lan.meta
  13. 8 0
      SFGgouhuo/Assets/Config/Lan/Editor.meta
  14. 197 0
      SFGgouhuo/Assets/Config/Lan/Editor/EditorLayout.cs
  15. 11 0
      SFGgouhuo/Assets/Config/Lan/Editor/EditorLayout.cs.meta
  16. BIN
      SFGgouhuo/Assets/Config/Lan/Editor/Excel.dll
  17. 33 0
      SFGgouhuo/Assets/Config/Lan/Editor/Excel.dll.meta
  18. BIN
      SFGgouhuo/Assets/Config/Lan/Editor/ICSharpCode.SharpZipLib.dll
  19. 33 0
      SFGgouhuo/Assets/Config/Lan/Editor/ICSharpCode.SharpZipLib.dll.meta
  20. 8 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage.meta
  21. 52 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/ExcelTool.cs
  22. 11 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/ExcelTool.cs.meta
  23. 14 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/LocalLanUpdate.cs
  24. 11 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/LocalLanUpdate.cs.meta
  25. 192 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/MultiLanguageConfigEditor.cs
  26. 11 0
      SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/MultiLanguageConfigEditor.cs.meta
  27. 8 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage.meta
  28. 50 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageData.cs
  29. 11 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageData.cs.meta
  30. 73 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatch.cs
  31. 11 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatch.cs.meta
  32. 111 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatchManager.cs
  33. 11 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatchManager.cs.meta
  34. 52 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/MultiLanguageConfig.cs
  35. 11 0
      SFGgouhuo/Assets/Config/Lan/MultiLanguage/MultiLanguageConfig.cs.meta
  36. BIN
      SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx
  37. 7 0
      SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx.meta
  38. 39 0
      SFGgouhuo/Assets/Resources/localLanguage.asset
  39. 8 0
      SFGgouhuo/Assets/Resources/localLanguage.asset.meta
  40. 45 1
      SFGgouhuo/Assets/Scenes/init.unity
  41. 22 0
      SFGgouhuo/Assets/_TerrainAutoUpgrade/layer_3d3aba195e4d26ee.terrainlayer
  42. 8 0
      SFGgouhuo/Assets/_TerrainAutoUpgrade/layer_3d3aba195e4d26ee.terrainlayer.meta
  43. 2 6
      SFGgouhuo/BakeryEditorAssembly.csproj
  44. 1 6
      SFGgouhuo/BakeryRuntimeAssembly.csproj
  45. 1 1
      SFGgouhuo/ProjectSettings/ProjectSettings.asset

File diff suppressed because it is too large
+ 2 - 6
SFGgouhuo/Assembly-CSharp-Editor-firstpass.csproj


File diff suppressed because it is too large
+ 1 - 6
SFGgouhuo/Assembly-CSharp-firstpass.csproj


+ 8 - 0
SFGgouhuo/Assets/Bundles/UI/Image/lan.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f38bccacbf87e34292f0f6aab774f2a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg.jpg


+ 121 - 0
SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg.jpg.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: 278c4a0ae29cd744db67a3221a7bc386
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg1.jpg


+ 121 - 0
SFGgouhuo/Assets/Bundles/UI/Image/lan/testImg1.jpg.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: b5fe88492f4c0f44b97149dc7a82cbd1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 239 - 0
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLogin.prefab

@@ -1,5 +1,242 @@
 %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
@@ -298,6 +535,8 @@ 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}

+ 1 - 5
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/ES/ESNickName.prefab

@@ -28,7 +28,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5670689622485111580}
   m_RootOrder: 1
@@ -104,7 +103,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5670689622485111580}
   m_RootOrder: 0
@@ -145,8 +143,7 @@ MonoBehaviour:
   m_text: 11111
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 1da915fddf6778d4481dd258c143281c, type: 2}
-  m_sharedMaterial: {fileID: 7433113812165889742, guid: 1da915fddf6778d4481dd258c143281c,
-    type: 2}
+  m_sharedMaterial: {fileID: 7433113812165889742, guid: 1da915fddf6778d4481dd258c143281c, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -239,7 +236,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2671539001571618722}
   - {fileID: 569837108238587650}

+ 1 - 5
SFGgouhuo/Assets/Bundles/UI/Prefab/Item/Item_TypeFilter.prefab

@@ -30,7 +30,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1456324710493017426}
   m_Father: {fileID: 0}
@@ -175,7 +174,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1456324710493017426}
   m_RootOrder: 0
@@ -216,8 +214,7 @@ MonoBehaviour:
   m_text: "\u4E0A\u88C5"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: d582870e09c42c8428e3c02f2a127087, type: 2}
-  m_sharedMaterial: {fileID: -8624800467275645516, guid: d582870e09c42c8428e3c02f2a127087,
-    type: 2}
+  m_sharedMaterial: {fileID: -8624800467275645516, guid: d582870e09c42c8428e3c02f2a127087, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -311,7 +308,6 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6091895333656424096}
   m_Father: {fileID: 7406196231707310903}

+ 8 - 0
SFGgouhuo/Assets/Config.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23fd2ffbfee70924db3f722fa37c09c2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
SFGgouhuo/Assets/Config/Lan.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 10a53ae42683351469988a5d3216aaf2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
SFGgouhuo/Assets/Config/Lan/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 60a756ec5c94c9b41a6377bf410a1c87
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 197 - 0
SFGgouhuo/Assets/Config/Lan/Editor/EditorLayout.cs

@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+
+public static class Styles
+{
+    private static GUIStyle _sectionHeader;
+    private static GUIStyle _sectionContent;
+
+    public static GUIStyle sectionHeader
+    {
+        get
+        {
+            if (Styles._sectionHeader == null)
+                Styles._sectionHeader = new GUIStyle((GUIStyle)"OL Title");
+            return Styles._sectionHeader;
+        }
+    }
+
+    public static GUIStyle sectionContent
+    {
+        get
+        {
+            if (Styles._sectionContent == null)
+            {
+                Styles._sectionContent = new GUIStyle((GUIStyle)"OL Box");
+                Styles._sectionContent.stretchHeight = false;
+            }
+
+            return Styles._sectionContent;
+        }
+    }
+}
+
+public static class EditorLayout
+{
+    private const int DEFAULT_FOLDOUT_MARGIN = 11;
+
+    public static T GetWindow<T>(string title, Vector2 size) where T : EditorWindow
+    {
+        T window = EditorWindow.GetWindow<T>(true, title);
+        window.minSize = window.maxSize = size;
+        return window;
+    }
+
+    public static Texture2D LoadTexture(string label)
+    {
+        string[] assets = AssetDatabase.FindAssets(label);
+        if (assets.Length != 0)
+        {
+            string guid = assets[0];
+            if (guid != null)
+                return AssetDatabase.LoadAssetAtPath<Texture2D>(AssetDatabase.GUIDToAssetPath(guid));
+        }
+
+        return (Texture2D)null;
+    }
+
+    public static Rect DrawTexture(Texture2D texture)
+    {
+        if (!((UnityEngine.Object)texture != (UnityEngine.Object)null))
+            return new Rect();
+        Rect aspectRect = GUILayoutUtility.GetAspectRect((float)((double)texture.width / (double)texture.height),
+            new GUILayoutOption[1] { GUILayout.ExpandWidth(true) });
+        GUI.DrawTexture(aspectRect, (Texture)texture, ScaleMode.ScaleAndCrop);
+        return aspectRect;
+    }
+
+    public static bool ObjectFieldButton(string label, string buttonText)
+    {
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField(label, new GUILayoutOption[1] { GUILayout.Width(146f) });
+        if (buttonText.Length > 24)
+            buttonText = "..." + buttonText.Substring(buttonText.Length - 24);
+        int num = GUILayout.Button(buttonText, EditorStyles.objectField, new GUILayoutOption[0]) ? 1 : 0;
+        EditorGUILayout.EndHorizontal();
+        return num != 0;
+    }
+
+    public static string ObjectFieldOpenFolderPanel(string label, string buttonText, string defaultPath)
+    {
+        if (!EditorLayout.ObjectFieldButton(label, buttonText))
+            return (string)null;
+        string str = defaultPath ?? "Assets/";
+        if (!Directory.Exists(str))
+            str = "Assets/";
+        return EditorUtility.OpenFolderPanel(label, str, string.Empty).Replace(Directory.GetCurrentDirectory() + "/", string.Empty);
+    }
+
+    public static string ObjectFieldOpenFilePanel(string label, string buttonText, string defaultPath)
+    {
+        if (!EditorLayout.ObjectFieldButton(label, buttonText))
+            return (string)null;
+        string str = defaultPath ?? "Assets/";
+        if (!File.Exists(str))
+            str = "Assets/";
+        return EditorUtility.OpenFilePanel(label, str, "dll").Replace(Directory.GetCurrentDirectory() + "/", string.Empty);
+    }
+
+    public static bool MiniButton(string c)
+    {
+        return EditorLayout.miniButton(c, EditorStyles.miniButton);
+    }
+
+    public static bool MiniButtonLeft(string c)
+    {
+        return EditorLayout.miniButton(c, EditorStyles.miniButtonLeft);
+    }
+
+    public static bool MiniButtonMid(string c)
+    {
+        return EditorLayout.miniButton(c, EditorStyles.miniButtonMid);
+    }
+
+    public static bool MiniButtonRight(string c)
+    {
+        return EditorLayout.miniButton(c, EditorStyles.miniButtonRight);
+    }
+
+    private static bool miniButton(string c, GUIStyle style)
+    {
+        GUILayoutOption[] guiLayoutOptionArray1;
+        if (c.Length != 1)
+            guiLayoutOptionArray1 = new GUILayoutOption[0];
+        else
+            guiLayoutOptionArray1 = new GUILayoutOption[1] { GUILayout.Width(19f) };
+        GUILayoutOption[] guiLayoutOptionArray2 = guiLayoutOptionArray1;
+        int num = GUILayout.Button(c, style, guiLayoutOptionArray2) ? 1 : 0;
+        if (num == 0)
+            return num != 0;
+        GUI.FocusControl((string)null);
+        return num != 0;
+    }
+
+    public static bool Foldout(bool foldout, string content, int leftMargin = 11)
+    {
+        return EditorLayout.Foldout(foldout, content, EditorStyles.foldout, leftMargin);
+    }
+
+    public static bool Foldout(bool foldout, string content, GUIStyle style, int leftMargin = 11)
+    {
+        EditorGUILayout.BeginHorizontal();
+        GUILayout.Space((float)leftMargin);
+        foldout = EditorGUILayout.Foldout(foldout, content, style);
+        EditorGUILayout.EndHorizontal();
+        return foldout;
+    }
+
+    public static string SearchTextField(string searchString)
+    {
+        bool changed = GUI.changed;
+        GUILayout.BeginHorizontal();
+        searchString = GUILayout.TextField(searchString, GUI.skin.FindStyle("ToolbarSeachTextField"), new GUILayoutOption[0]);
+        if (GUILayout.Button(string.Empty, GUI.skin.FindStyle("ToolbarSeachCancelButton"), new GUILayoutOption[0]))
+            searchString = string.Empty;
+        GUILayout.EndHorizontal();
+        GUI.changed = changed;
+        return searchString;
+    }
+
+    public static bool MatchesSearchString(string str, string search)
+    {
+        string[] strArray = search.Split(new char[1] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+        if (strArray.Length != 0)
+            return ((IEnumerable<string>)strArray).Any<string>(new Func<string, bool>(str.Contains));
+        return true;
+    }
+
+    public static bool DrawSectionHeaderToggle(string header, bool value)
+    {
+        return GUILayout.Toggle(value, header, Styles.sectionHeader, new GUILayoutOption[0]);
+    }
+
+    public static void BeginSectionContent()
+    {
+        EditorGUILayout.BeginVertical(Styles.sectionContent, new GUILayoutOption[0]);
+    }
+
+    public static void EndSectionContent()
+    {
+        EditorGUILayout.EndVertical();
+    }
+
+    public static Rect BeginVerticalBox()
+    {
+        return EditorGUILayout.BeginVertical(GUI.skin.box, new GUILayoutOption[0]);
+    }
+
+    public static void EndVerticalBox()
+    {
+        EditorGUILayout.EndVertical();
+    }
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/Editor/EditorLayout.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7bfcc31f8a7fa1a4e9d60a5d131d3c54
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
SFGgouhuo/Assets/Config/Lan/Editor/Excel.dll


+ 33 - 0
SFGgouhuo/Assets/Config/Lan/Editor/Excel.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 15cf97a26177d5848b36890c7088d74a
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
SFGgouhuo/Assets/Config/Lan/Editor/ICSharpCode.SharpZipLib.dll


+ 33 - 0
SFGgouhuo/Assets/Config/Lan/Editor/ICSharpCode.SharpZipLib.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 2e91496a476be56448158abcbafe2901
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 66a436b33fff7c842aad6535439bc183
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 52 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/ExcelTool.cs

@@ -0,0 +1,52 @@
+using Excel;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+
+public class ExcelTool
+{
+    public static List<LanguageData> ReadLanguageData(string ExcelPath, string sheetName)
+    {
+        DataRowCollection collect = ReadExcel(ExcelPath, sheetName);
+        List<LanguageData> items = new List<LanguageData>();
+
+
+        for (int i = 1; i < collect.Count; i++)
+        {
+            if (string.IsNullOrEmpty(collect[i][0].ToString()))
+                continue;
+
+            LanguageData item = new LanguageData
+            {
+                name = string.IsNullOrEmpty(collect[i][MultiLanguageConfigIndex.name].ToString()) ? "Null" : collect[i][MultiLanguageConfigIndex.name].ToString(),
+                content = MultLanguageAdd(collect[i], MultiLanguageConfigIndex.en, (int)LanguageType.Count),
+            };
+            items.Add(item);
+        }
+        return items;
+    }
+    private static List<LanguageContent> MultLanguageAdd(DataRow dataRow, int min, int max)
+    {
+        List<LanguageContent> addition = new List<LanguageContent>();
+
+        for (int i = min; i <= max; i++)
+        {
+            addition.Add(new LanguageContent(dataRow[i].ToString(), (LanguageType)i));
+        }
+        return addition;
+
+    }
+
+    private static DataRowCollection ReadExcel(string excelPath, string sheetName)
+    {
+
+
+        FileStream stream = File.Open(excelPath, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
+        IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
+
+        DataSet result = excelReader.AsDataSet();
+
+        return result.Tables[sheetName].Rows;
+    }
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/ExcelTool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d38fc9e5eec57554b9ece5cf8a50ec1d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 14 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/LocalLanUpdate.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Editor.MultiLanguage
+{
+    class Aaa
+    {
+
+
+    }
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/LocalLanUpdate.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e38edcb4e0edec344822e895bb4505e3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 192 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/MultiLanguageConfigEditor.cs

@@ -0,0 +1,192 @@
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+public class MultilanguageEditorWindow : EditorWindow
+{
+    private void OnGUI()
+    {
+
+        if (EditorLayout.MiniButtonLeft("刷新语言表"))
+        {
+            MultiLanguageConfigEditor.RefreshETLocalLangugale();
+        }
+        if (EditorLayout.MiniButtonLeft("绑定语言表"))
+        {
+            MultiLanguageConfigEditor.BindETLocalLangugale();
+        }
+
+
+
+
+
+    }
+
+}
+
+
+public static class MultiLanguageConfigEditor
+{
+
+    public static string pathETConfig = "Assets/Resources/localLanguage.asset";
+
+
+
+    private static MultiLanguageConfig ETLanguageConfig;
+
+    public static string ETLocalLanguagePath
+    {
+        get
+        {
+
+
+            string result = Application.dataPath;
+
+            return result + @"/Config/Lan/localLanguage.xlsx";
+        }
+
+    }
+
+
+    [MenuItem("Tools/设置本地语言表")]
+    static void OpenMultilanguageEditorWindow()
+    {
+
+        EditorLayout.GetWindow<MultilanguageEditorWindow>("本地语言表", new Vector2(300, 500));
+
+
+
+    }
+
+
+    public static void RefreshETLocalLangugale()
+    {
+
+
+
+        ETLanguageConfig = AssetDatabase.LoadAssetAtPath<MultiLanguageConfig>(pathETConfig);
+
+        FreshLanguage();
+        Debug.Log("刷新語言完成!");
+
+    }
+
+
+    public static void ClearChache()
+    {
+        PlayerPrefs.DeleteAll();
+
+    }
+
+
+    public static void BindETLocalLangugale()
+    {
+
+        ETLanguageConfig = AssetDatabase.LoadAssetAtPath<MultiLanguageConfig>(pathETConfig);
+
+
+
+        //获取到 文件夹下 所有的预制体 
+        List<GameObject> listLanGo = GetFileAllPrefab("Bundles/UI");
+
+
+
+
+        string matchRuleName = "lan_";
+        for (int i = 0; i < listLanGo.Count; i++)
+        {
+            //便利 预制体 中所有 带 LocLan_  的节点 。 locLan
+            GameObject go = listLanGo[i];
+            Transform[] arr = go.GetComponentsInChildren<Transform>();
+
+            foreach (Transform item in arr)
+            {
+                if (item.name.Contains(matchRuleName))
+                {
+                    //Debug.Log(go.name + "   " + item.name);
+                    LanguageMatch lm = GetLanGoScr(item.gameObject);
+                    lm.configName = item.name.Replace(matchRuleName, "");
+
+                }
+
+            }
+            PrefabUtility.SavePrefabAsset(go);
+            //查看该节点下 是否有 languagmatch 组件。  无添加
+            //修改 该节点组件的 字段值。
+
+
+        }
+        SetSave();
+        Debug.Log("本地多语言 绑定完成!");
+
+
+    }
+    static LanguageMatch GetLanGoScr(GameObject go)
+    {
+        LanguageMatch lm = go.GetComponent<LanguageMatch>();
+        if (lm == null)
+            lm = go.AddComponent<LanguageMatch>();
+        return lm;
+
+    }
+
+
+    static List<GameObject> GetFileAllPrefab(string assetPath)
+    {
+        List<GameObject> list = new List<GameObject>();
+        string[] aa = Directory.GetFiles(Application.dataPath + "/" + assetPath, "*.prefab", SearchOption.AllDirectories);
+        foreach (var item in aa)
+        {
+            string tt = item.Replace(Application.dataPath + "/", "");
+            tt = tt.Replace(@"\", "/");
+            tt = "Assets/" + tt;
+            GameObject go = AssetDatabase.LoadAssetAtPath<GameObject>(tt);
+            list.Add(go);
+        }
+        return list;
+    }
+
+
+
+
+
+
+
+
+
+    public static void FreshLanguage()
+    {
+ 
+        ReadExcelCoverData(ETLocalLanguagePath, "language");
+   
+
+    }
+
+
+
+    private static void ReadExcelCoverData(string ExcelPath, string sheetName)
+    {
+        if (string.IsNullOrEmpty(ExcelPath))
+        {
+            return;
+        }
+
+        ETLanguageConfig.languageInfos = ExcelTool.ReadLanguageData(ExcelPath, sheetName);
+        SetSave();
+    }
+
+    public static void SetSave()
+    {
+        EditorUtility.SetDirty(ETLanguageConfig);
+
+        AssetDatabase.SaveAssets();
+        AssetDatabase.Refresh();
+    }
+
+
+
+
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/Editor/MultiLanguage/MultiLanguageConfigEditor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f3a5bfd145e246542b533eb1c4e8da25
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 04acd7141a5fb0c4a8093702d8a9b5e5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 50 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageData.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+[Serializable]
+public class LanguageData
+{
+    public string name;
+
+    public List<LanguageContent> content;
+    public LanguageData() { }
+    public LanguageData(string name, List<LanguageContent> content)
+    {
+        this.name = name;
+        this.content = content;
+    }
+}
+
+[Serializable]
+public class LanguageContent
+{
+    public string content;
+    public LanguageType languageType;
+    public LanguageContent() { }
+    public LanguageContent(string content, LanguageType languageType)
+    {
+        this.content = content;
+        this.languageType = languageType;
+    }
+}
+public enum LanguageType
+{
+    en,
+    cn,
+    tc,
+    ph,
+    vn,
+    Count,
+}
+
+
+[Serializable]
+public struct MultiLanguageConfigIndex
+{
+    public const int name = 0;
+    public const int en = 1;
+    public const int cn = 3;
+    public const int tc = 2;
+    public const int ph = 4;
+    public const int vn = 5;
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2875b743706754c47a88db78035ab780
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatch.cs

@@ -0,0 +1,73 @@
+using TMPro;
+using UnityEngine;
+
+using UnityEngine.UI;
+
+
+public class LanguageMatch : MonoBehaviour
+{
+    public string configName;
+
+
+
+    private Text languageText;
+    private TextMeshProUGUI languageTextMeshPro;
+
+    private Image img;
+
+    private void Awake()
+    {
+        languageText = GetComponent<Text>();
+        languageTextMeshPro = GetComponent<TextMeshProUGUI>();
+        img = GetComponent<Image>();
+    }
+
+
+
+    void OnEnable()
+    {
+       
+        LanguageMatchManager.Instance.AddScrLanguageMatch(this);
+
+    }
+    public async void RefreshTxt(string str)
+    {
+        if (img != null)
+        {
+            img.sprite = await YooAssetManager.Instance.LoadAsset<Sprite>(str);
+        }
+        else
+        {
+            if (languageText)
+                languageText.text = str;
+            if (languageTextMeshPro)
+                languageTextMeshPro.text = str;
+
+
+        }
+
+
+
+    }
+
+
+    private void OnDisable()
+    {
+
+        LanguageMatchManager.Instance.RemoveScrLanguageMatch(this);
+    }
+    private void OnDestroy()
+    {
+
+        LanguageMatchManager.Instance.RemoveScrLanguageMatch(this);
+    }
+
+
+
+
+
+
+
+}
+
+

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatch.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: be71fff96e530c74b8d5582f4db61eed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 111 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatchManager.cs

@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+public class LanguageMatchManager : MonoBehaviour
+{
+    static LanguageMatchManager _instance;
+
+    public static LanguageMatchManager Instance { get { return _instance; } }
+
+    private int languageType = 0;
+    private MultiLanguageConfig scrMonoConfig;
+    public MultiLanguageConfig scrConfig;
+    private List<LanguageMatch> listlanguageMatch;
+
+
+    public void Awake()
+    {
+     
+        Init();
+    }
+    public void Init()
+    {
+        _instance = this;
+        languageType = PlayerPrefs.GetInt("CurLanguage", 0);
+        listlanguageMatch = new List<LanguageMatch>();
+        scrMonoConfig = Resources.Load<MultiLanguageConfig>("localLanguage");
+    }
+
+    public void AddScrLanguageMatch(LanguageMatch item)
+    {
+        if (!listlanguageMatch.Contains(item))
+        {
+            listlanguageMatch.Add(item);
+            MatchLanguageText(item);
+        }
+    }
+
+    public string GetLanByKey(string str)
+    {
+        string lan = scrMonoConfig.GetDataByName(str, (LanguageType)languageType);
+        return lan;
+    }
+
+    public void RemoveScrLanguageMatch(LanguageMatch item)
+    {
+        if (listlanguageMatch.Contains(item))
+        {
+            listlanguageMatch.Remove(item);
+        }
+    }
+
+    public void RefreshLanguage(int _lan)
+    {
+        int lan = (int)_lan;
+        if (languageType == lan) return;
+        languageType = lan;
+        foreach (var item in listlanguageMatch)
+        {
+            if (item != null && item.gameObject.activeSelf)
+            {
+                MatchLanguageText(item);
+            }
+        }
+    }
+
+    public void MatchLanguageText(LanguageMatch lm)
+    {
+        if (scrConfig == null)
+        {
+            lm.RefreshTxt("null");
+            return;
+        }
+
+        string str = scrConfig.GetDataByName(lm.configName, (LanguageType)languageType);
+        lm.RefreshTxt(str == null ? "null" : str);
+        if (str == null)
+        {
+            string strr = GetErrorPrefabName(lm, out string parentName);
+            if (!parentName.Contains("Clone"))
+            {
+                Debug.LogError($"静态多语言表 ID:{lm.configName},表里不存在.预制体位置:{strr}");
+            }
+        }
+    }
+
+    public LanguageType GetCurLanType()
+    {
+        return (LanguageType)languageType;
+    }
+
+    public string GetErrorPrefabName(LanguageMatch lm, out string parentName)
+    {
+        string path = lm.name;
+        bool isFind = true;
+        Transform tf = lm.transform;
+        int debugCount = 16;
+        parentName = "";
+        while (isFind && debugCount > 0)
+        {
+            debugCount--;
+            tf = tf.parent;
+            if (tf.name.Contains("Dlg"))
+            {
+                parentName = tf.name;
+                isFind = false;
+            }
+            path = tf.gameObject.name + "/" + path;
+        }
+        return path;
+    }
+}

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/LanguageMatchManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b86c613c8869fa3468c5ec75cdeea314
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 52 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/MultiLanguageConfig.cs

@@ -0,0 +1,52 @@
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "localLanguage", menuName = "ScriptableObjects/LocalLanguage", order = 1)]
+public class MultiLanguageConfig : ScriptableObject
+{
+    public List<LanguageData> languageInfos = new List<LanguageData>();
+
+    private Dictionary<string, LanguageData> _languageDataDic;//
+
+    public Dictionary<string, LanguageData> languageDataDic
+    {
+        get
+        {
+            if (_languageDataDic == null || _languageDataDic.Count <= 0)
+            {
+                InitLanguageDataDic();
+            }
+
+            return _languageDataDic;
+        }
+    }
+
+    private void InitLanguageDataDic()
+    {
+        _languageDataDic = new Dictionary<string, LanguageData>();
+        for (int i = 0; i < languageInfos.Count; i++)
+        {
+
+            _languageDataDic.Add(languageInfos[i].name, languageInfos[i]);
+        }
+    }
+
+    public string GetDataByName(string name, LanguageType languageType)
+    {
+
+        if (languageDataDic.ContainsKey(name))
+        {
+            if (languageDataDic[name].content.Count > (int)languageType)
+            {
+                return languageDataDic[name].content[(int)languageType].content;
+            }
+
+        }
+
+        return null;
+    }
+}
+
+

+ 11 - 0
SFGgouhuo/Assets/Config/Lan/MultiLanguage/MultiLanguageConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 813c8e15a79083342bbf19fc5f5f108a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


+ 7 - 0
SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf4123b08f122aa4fbfdc48e145000f4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,39 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 813c8e15a79083342bbf19fc5f5f108a, type: 3}
+  m_Name: localLanguage
+  m_EditorClassIdentifier: 
+  languageInfos:
+  - name: test
+    content:
+    - content: test
+      languageType: 1
+    - content: "\u6E2C\u8A66"
+      languageType: 2
+    - content: "\u6E2C\u8A66"
+      languageType: 3
+    - content: "\u6E2C\u8A66"
+      languageType: 4
+    - content: 
+      languageType: 5
+  - name: testImg
+    content:
+    - content: testImg
+      languageType: 1
+    - content: testImg2
+      languageType: 2
+    - content: "\u5074\u8996\u5716"
+      languageType: 3
+    - content: "\u5074\u8996\u5716"
+      languageType: 4
+    - content: 
+      languageType: 5

+ 8 - 0
SFGgouhuo/Assets/Resources/localLanguage.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51df16a7acb6e0d4cae16c41b5e68ff7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 45 - 1
SFGgouhuo/Assets/Scenes/init.unity

@@ -538,6 +538,50 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 151.366, y: -30, z: 0}
+--- !u!1 &1039498566
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1039498568}
+  - component: {fileID: 1039498567}
+  m_Layer: 0
+  m_Name: lanMgr
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1039498567
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039498566}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b86c613c8869fa3468c5ec75cdeea314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrConfig: {fileID: 11400000, guid: 51df16a7acb6e0d4cae16c41b5e68ff7, type: 2}
+--- !u!4 &1039498568
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039498566}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 338.13647, y: 771.0102, z: -9.057494}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1267980970
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -815,7 +859,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1352390931
 GameObject:

+ 22 - 0
SFGgouhuo/Assets/_TerrainAutoUpgrade/layer_3d3aba195e4d26ee.terrainlayer

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1953259897 &8574412962073106934
+TerrainLayer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: layer_3d3aba195e4d26ee
+  m_DiffuseTexture: {fileID: 2800000, guid: c32a0b1f62ac42e4399935ffff09c099, type: 3}
+  m_NormalMapTexture: {fileID: 0}
+  m_MaskMapTexture: {fileID: 0}
+  m_TileSize: {x: 15, y: 15}
+  m_TileOffset: {x: 0, y: 0}
+  m_Specular: {r: 0, g: 0, b: 0, a: 0}
+  m_Metallic: 0
+  m_Smoothness: 0
+  m_NormalScale: 1
+  m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
+  m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
+  m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
+  m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

+ 8 - 0
SFGgouhuo/Assets/_TerrainAutoUpgrade/layer_3d3aba195e4d26ee.terrainlayer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3a160a6488930f04e8ff4d12d8215f5a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8574412962073106934
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 2 - 6
SFGgouhuo/BakeryEditorAssembly.csproj


File diff suppressed because it is too large
+ 1 - 6
SFGgouhuo/BakeryRuntimeAssembly.csproj


+ 1 - 1
SFGgouhuo/ProjectSettings/ProjectSettings.asset

@@ -707,7 +707,7 @@ PlayerSettings:
   assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
-    Standalone: 3
+    Standalone: 6
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Template_3D

Some files were not shown because too many files changed in this diff