龙腾猫跃 4 лет назад
Родитель
Сommit
130f7aad93

+ 6 - 2
Assets/Localization/String Localization Shared Data.asset

@@ -15,8 +15,12 @@ MonoBehaviour:
   m_TableCollectionName: String Localization
   m_TableCollectionNameGuidString: e3f186d36085a4c16a16dd9c5dead58e
   m_Entries:
-  - m_Id: 5581195698176
-    m_Key: Canvas/Test
+  - m_Id: 145542393880576
+    m_Key: SceneMain/UI/UI Button/Text
+    m_Metadata:
+      m_Items: []
+  - m_Id: 147212595093504
+    m_Key: SceneMain/UI/UI Button
     m_Metadata:
       m_Items: []
   m_Metadata:

+ 6 - 2
Assets/Localization/String Localization_en-US.asset

@@ -18,8 +18,12 @@ MonoBehaviour:
   m_Metadata:
     m_Items: []
   m_TableData:
-  - m_Id: 5581195698176
-    m_Localized: Test
+  - m_Id: 147212595093504
+    m_Localized: '#coin English'
+    m_Metadata:
+      m_Items: []
+  - m_Id: 145542393880576
+    m_Localized: English Button
     m_Metadata:
       m_Items: []
   references:

+ 6 - 2
Assets/Localization/String Localization_zh-CN.asset

@@ -18,8 +18,12 @@ MonoBehaviour:
   m_Metadata:
     m_Items: []
   m_TableData:
-  - m_Id: 5581195698176
-    m_Localized: "\u6D4B\u8BD5"
+  - m_Id: 147212595093504
+    m_Localized: "#coin \u4E2D\u6587"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 145542393880576
+    m_Localized: "\u4E2D\u6587\u6309\u94AE"
     m_Metadata:
       m_Items: []
   references:

Разница между файлами не показана из-за своего большого размера
+ 8 - 1458
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-BOLD SDF.asset


+ 1 - 1
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-BOLD SDF.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2b34f32c09ae0ed459c0871a3e3a0782
+guid: 657c8f12eebe4e44a801288bc506d2a1
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Разница между файлами не показана из-за своего большого размера
+ 0 - 1175
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-LIGHT SDF.asset


+ 0 - 8
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-LIGHT SDF.asset.meta

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

Разница между файлами не показана из-за своего большого размера
+ 41 - 1
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-NORMAL SDF.asset


+ 1 - 1
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-NORMAL SDF.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 111f669b42bef2647b5b553aedbc9c96
+guid: 283cec36496b84640a3220e6d4736677
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

+ 2 - 9
Assets/Resources/Controls/Tooltip/BasicTooltip.cs

@@ -38,7 +38,6 @@ public class BasicTooltip : MonoBehaviour {
             _hovered = value;
             if (value) {
                 StartHover(UIExtensionsInputManager.MousePosition, true);
-                StartCoroutine(HoveredMouseFollowingLoop());
             } else {
                 target.HideTooltip();
             }
@@ -57,6 +56,8 @@ public class BasicTooltip : MonoBehaviour {
         if (textDescription.rawText != description) {
             textDescription.text = description;
         }
+        // ¸üÐÂλÖÃ
+        StartHover(UIExtensionsInputManager.MousePosition);
     }
 
     #region "ԭʼ Sender"
@@ -84,19 +85,11 @@ public class BasicTooltip : MonoBehaviour {
         }
     }
     
-    IEnumerator HoveredMouseFollowingLoop() {
-        while (hovered) {
-            StartHover(UIExtensionsInputManager.MousePosition);
-            yield return null;
-        }
-    }
-
     //public void OnDeselect(BaseEventData eventData) {
     //    hovered = false;
     //}
 
     void StartHover(Vector3 position, bool shouldCanvasUpdate = false) {
-        Update();
         target.SetTooltip(position, shouldCanvasUpdate);
     }
 

+ 182 - 106
Assets/Scenes/SceneMain.unity

@@ -137,6 +137,7 @@ GameObject:
   - component: {fileID: 206329167}
   - component: {fileID: 206329166}
   - component: {fileID: 206329165}
+  - component: {fileID: 206329170}
   m_Layer: 5
   m_Name: UI Button
   m_TagString: Untagged
@@ -283,6 +284,47 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 206329163}
   m_CullTransparentMesh: 1
+--- !u!114 &206329170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 206329163}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TrackedObjects:
+  - rid: 2680856002935652364
+  references:
+    version: 2
+    RefIds:
+    - rid: 2680856002935652364
+      type: {class: TrackedMonoBehaviourObject, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization}
+      data:
+        m_Target: {fileID: 206329165}
+        m_TrackedProperties:
+          items:
+          - rid: 2680856002935652365
+        m_UpdateType: 0
+        m_Changed:
+          m_PersistentCalls:
+            m_Calls: []
+    - rid: 2680856002935652365
+      type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization}
+      data:
+        m_Localized:
+          m_TableReference:
+            m_TableCollectionName: GUID:e3f186d36085a4c16a16dd9c5dead58e
+          m_TableEntryReference:
+            m_KeyId: 147212595093504
+            m_Key: 
+          m_FallbackState: 0
+          m_WaitForCompletion: 0
+          m_LocalVariables: []
+        m_PropertyPath: title
 --- !u!1 &381495605
 GameObject:
   m_ObjectHideFlags: 0
@@ -293,7 +335,8 @@ GameObject:
   m_Component:
   - component: {fileID: 381495606}
   - component: {fileID: 381495608}
-  - component: {fileID: 381495607}
+  - component: {fileID: 381495609}
+  - component: {fileID: 381495610}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -312,8 +355,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1647618757}
+  m_Children: []
   m_Father: {fileID: 206329164}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -322,7 +364,15 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &381495607
+--- !u!222 &381495608
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 381495605}
+  m_CullTransparentMesh: 1
+--- !u!114 &381495609
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,46 +381,148 @@ MonoBehaviour:
   m_GameObject: {fileID: 381495605}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 20e2896f5c5788d4c9603bb195d39418, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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_FontData:
-    m_Font: {fileID: 12800000, guid: c7b3f6784e6f2ed498a6493a577e204e, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 1
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "#coin \u6D4B\u8BD5\u6309\u94AE"
-  ImageScalingFactor: 1.05
-  hyperlinkColor: blue
-  imageOffset: {x: 0, y: -2.5}
-  isCreating_m_HrefInfos: 0
-  m_OnHrefClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!222 &381495608
-CanvasRenderer:
+  m_text: "\u4E2D\u6587\u6309\u94AE"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 283cec36496b84640a3220e6d4736677, type: 2}
+  m_sharedMaterial: {fileID: -4366241451420931623, guid: 283cec36496b84640a3220e6d4736677, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278190080
+  m_fontColor: {r: 0, g: 0, b: 0, 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: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  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 &381495610
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 381495605}
-  m_CullTransparentMesh: 1
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_TrackedObjects:
+  - rid: 2680856002935652354
+  references:
+    version: 2
+    RefIds:
+    - rid: 2680856002935652354
+      type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization}
+      data:
+        m_Target: {fileID: 381495609}
+        m_TrackedProperties:
+          items:
+          - rid: 2680856002935652355
+          - rid: 2680856002935652356
+          - rid: 2680856002935652357
+        m_UpdateType: 0
+    - rid: 2680856002935652355
+      type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization}
+      data:
+        m_Localized:
+          m_TableReference:
+            m_TableCollectionName: GUID:e3f186d36085a4c16a16dd9c5dead58e
+          m_TableEntryReference:
+            m_KeyId: 145542393880576
+            m_Key: 
+          m_FallbackState: 0
+          m_WaitForCompletion: 0
+          m_LocalVariables: []
+        m_PropertyPath: m_text
+    - rid: 2680856002935652356
+      type: {class: FloatTrackedProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization}
+      data:
+        m_PropertyPath: m_fontSize
+        m_VariantData:
+        - localeIdentifier:
+            m_Code: zh-CN
+          value: 20
+        - localeIdentifier:
+            m_Code: en-US
+          value: 16
+    - rid: 2680856002935652357
+      type: {class: FloatTrackedProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization}
+      data:
+        m_PropertyPath: m_fontSizeBase
+        m_VariantData:
+        - localeIdentifier:
+            m_Code: zh-CN
+          value: 20
+        - localeIdentifier:
+            m_Code: en-US
+          value: 16
 --- !u!1 &557375725
 GameObject:
   m_ObjectHideFlags: 0
@@ -3166,82 +3318,6 @@ CompositeCollider2D:
       - {x: 5.0000253, y: -8.00001}
   m_VertexDistance: 0.0005
   m_OffsetDistance: 0.00005
---- !u!1 &1647618756
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1647618757}
-  - component: {fileID: 1647618759}
-  - component: {fileID: 1647618758}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1647618757
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1647618756}
-  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: 381495606}
-  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: -43, y: -1.5}
-  m_SizeDelta: {x: 21, y: 21}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1647618758
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1647618756}
-  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: 9d574feab34b8984e9210c0c93354199, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1647618759
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1647618756}
-  m_CullTransparentMesh: 1
 --- !u!1 &1913634232
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
ProjectSettings/BurstAotSettings_WebGL.json

@@ -0,0 +1,14 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "OptimizeFor": 0
+  }
+}

+ 1 - 1
ProjectSettings/LocalizationSettings.asset

@@ -18,4 +18,4 @@ MonoBehaviour:
   m_AssetTable:
     m_TableReference:
       m_TableCollectionName: GUID:e0562828673684864b10340c1cf80e60
-  m_TrackingChanges: 1
+  m_TrackingChanges: 0

+ 1 - 12
ProjectSettings/ProjectSettings.asset

@@ -41,12 +41,6 @@ PlayerSettings:
     height: 1
   m_SplashScreenLogos: []
   m_VirtualRealitySplashScreen: {fileID: 0}
-  m_ShowUnitySplashAds: 0
-  m_AdsAndroidGameId: 
-  m_AdsIosGameId: 
-  m_ShowSplashAdsSlogan: 0
-  m_SloganImage: {fileID: 0}
-  m_SloganHeight: 150
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1920
   defaultScreenHeight: 1080
@@ -91,11 +85,6 @@ PlayerSettings:
   hideHomeButton: 0
   submitAnalytics: 1
   usePlayerLog: 1
-  autoStreaming: 0
-  useAnimationStreaming: 0
-  useFontStreaming: 0
-  autoStreamingId: 
-  instantGameAppId: 
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   useFlipModelSwapchain: 1
@@ -575,7 +564,7 @@ PlayerSettings:
   webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 0
+  webGLCompressionFormat: 1
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0

+ 1 - 3
ProjectSettings/UnityConnectSettings.asset

@@ -4,14 +4,12 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
   m_DashboardUrl: https://dashboard.unity3d.com
-  m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
-  m_CNConfigUrl: https://cdp.cloud.unity.cn/config
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity.cn

Некоторые файлы не были показаны из-за большого количества измененных файлов