塔防射击头像布局问题，修改文字和部分问题

Assets/AddressableAssetsData/link.xml

@@ -0,0 +1,26 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.Localization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Localization.Locale" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData" preserve="all" />
+    <type fullname="UnityEngine.Localization.Tables.StringTable" preserve="all" />
+    <type fullname="UnityEngine.Localization.LocaleIdentifier" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Metadata.MetadataCollection" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.DistributedUIDGenerator" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.SharedTableData/SharedTableEntry" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Metadata.SmartFormatTag" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.Localization.Tables.TableEntryData" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Object" preserve="all" />
+  </assembly>
+</linker>

Assets/AddressableAssetsData/link.xml.meta

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

Assets/BowArrow/InfraredCamera/InfraredDemo.cs

@@ -685,7 +685,26 @@ public class InfraredDemo : JCUnityLib.ViewBase
                 {
                     quat = Quaternion.AngleAxis(-180, Vector3.up) * quat;
                 }
-                if (CameraToLook.ins != null) CameraToLook.ins.localRotation = quat;
+                if (GameAssistUI.ins && GameAssistUI.ins.scaleAimOn)
+                {
+                    if (CameraToLook.ins != null)
+                    {
+                        // 平滑旋转逻辑
+                        float dt = Mathf.Min(Time.deltaTime, 0.05f); // 避免低帧率造成旋转跳跃
+                        float smoothingFactor = GameMgr.gameType == 1 ? 12 : 7f; // 原始未开镜的FOV,可调节，数值越大越“跟手”
+                        CameraToLook.ins.localRotation = Quaternion.Slerp(
+                            CameraToLook.ins.localRotation,
+                            quat,
+                            dt * GameAssistUI.ins.currentSensitivity * smoothingFactor
+                        );
+                    }
+                 
+                }
+                else {
+                    if (CameraToLook.ins != null) CameraToLook.ins.localRotation = quat;
+                }
+               
+
                 if (SB_EventSystem.ins) SB_EventSystem.ins.MoveSimulateMouseByInfrared(point);
                 //移动目标游戏
                 if (GeneratingTarget.gm != null) GeneratingTarget.gm.shootingEvent.OnPositionUpdate(point);

Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider.prefab

@@ -647,7 +647,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 24d1e577dc42aaf4ba6e64be26be3845, type: 3}
+  m_Texture: {fileID: 2800000, guid: 98ec0f05c7042a741b730f25ef36fed9, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -1015,7 +1015,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 24d1e577dc42aaf4ba6e64be26be3845, type: 3}
+  m_Texture: {fileID: 2800000, guid: 98ec0f05c7042a741b730f25ef36fed9, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0

Assets/BowArrow/Scripts/Game/GameAssistUI.cs

@@ -321,6 +321,8 @@ public class GameAssistUI : MonoBehaviour
     float[] scaleAimScopeScales = {150, 98, 58, 29, 14.5f};
     Sequence seq1 = null;
     [System.NonSerialized] public bool scaleAimOn = false; //该功能是否处于打开状态
+    public float baseSensitivity = 1.0f;  // 普通状态下的旋转灵敏度
+    public float currentSensitivity { get; set; } = 1.0f;
     bool openScaleAim()
     {   
         int scaleValue = GetPropScaleAimValue();
@@ -370,7 +372,12 @@ public class GameAssistUI : MonoBehaviour
         bowCamera.banCameraFieldOfView = open;
         bowCamera.SetScaleAimDisplaying(isScaleAimDisplaying);
         if (open) {
-            bowCamera.SetCameraFieldOfView(scaleAimFieldOfViews[scaleValue - 1]);
+           // bowCamera.SetCameraFieldOfView(scaleAimFieldOfViews[scaleValue - 1]);
+            float currentFov = scaleAimFieldOfViews[scaleValue - 1];
+            float baseFov = GameMgr.gameType == 1 ? 55f : 25f; // 原始未开镜的FOV,奥运塔防是55，其他打猎是25
+            currentSensitivity = baseSensitivity * (currentFov / baseFov);
+            Debug.Log("currentSensitivity:"+ currentSensitivity);
+            bowCamera.SetCameraFieldOfView(currentFov);
         }
 
         Vector3 localPosition = ArmBow.ins.transform.localPosition;

Assets/BowArrow/Scripts/Manager/GameMgr.cs

@@ -32,7 +32,7 @@ public class GameMgr : MonoBehaviour
         OnlinePKTest.Init();
         if (Application.platform == RuntimePlatform.WindowsEditor)
         {
-            debugInEditor = true;
+            debugInEditor = false;
         }
         AudioMgr.Init();
         this.InitGameMode();

Assets/ShotSimulator/Languages/Tables/LanguagesTable_zh-Hans.asset

@@ -340,7 +340,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 58549582655488
-    m_Localized: "\u5B50\u5F39\u8017\u5C3D\uFF0C\u8BF7\u8DDF\u6362\u5F39\u5939"
+    m_Localized: "\u5B50\u5F39\u8017\u5C3D\uFF0C\u8BF7\u66F4\u6362\u5F39\u5939"
     m_Metadata:
       m_Items: []
   - m_Id: 58875425550336

Assets/ShotSimulator/Scripts/UI/Train/ExecuteTrainUIView.cs

@@ -120,27 +120,27 @@ namespace ShotSimulator.UI
             }
 
             score_JumpNumComponent.Init();
-            precisionText.text = "N/A";
+            precisionText.text = "N / A";
             switch (m_TrainHandle.TrainInfo.finishType)
             {
                 case TrainTaskFinishType.Time:
                     timeText.text = SecondToFormattedTime((int)m_TrainHandle.TrainInfo.duration);
                     break;
                 case TrainTaskFinishType.Number:
-                    timeText.text = string.Format("{0}/{1}", m_TrainHandle.TrainInfo.maxNumber, m_TrainHandle.TrainInfo.maxNumber);
+                    timeText.text = string.Format("{0} / {1}", m_TrainHandle.TrainInfo.maxNumber, m_TrainHandle.TrainInfo.maxNumber);
                     break;
                 default:
-                    timeText.text = "-/-";
+                    timeText.text = "- / -";
                     break;
             }
 
             if (m_TrainHandle.TrainInfo.m_TrainFirearmConfig.isNeedConsumeBullet)
             {
-                bulletNumsText.text = "-:-";
+                bulletNumsText.text = "- / -";
             }
             else
             {
-                bulletNumsText.text = "¡Þ";
+                bulletNumsText.text = "∞";
             }
 
             StartCoroutine(StartCountdown());
@@ -204,7 +204,7 @@ namespace ShotSimulator.UI
             if (data != null)
             {
                 string color = data.magazineBulletNums <= bulletLowNums ? "red" : "white";
-                bulletNumsText.text = string.Format("<color={0}>{1}</color>:{2}", color, data.magazineBulletNums, data.magazineCapacity);
+                bulletNumsText.text = string.Format("<color={0}>{1}</color> / {2}", color, data.magazineBulletNums, data.magazineCapacity);
 
                 if (current_ReloadTipObj != null)
                 {
@@ -279,7 +279,7 @@ namespace ShotSimulator.UI
             {
                 if (m_TrainHandle.TrainInfo.finishType == TrainTaskFinishType.Number)
                 {
-                    timeText.text = string.Format("{0}/{1}", data.currentNumber, data.maxNumber);
+                    timeText.text = string.Format("{0} / {1}", data.currentNumber, data.maxNumber);
                 }
             }
         }

Assets/WildAttack/Atlas/main/head_icon2.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: ade7399573ba9d548a71d4edf055011c
+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
+  ignoreMasterTextureLimit: 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: iPhone
+    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: Android
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/WildAttack/Atlas/main/hear_bg.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 3948faa2072080f4bb1e644c6cf00a70
+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
+  ignoreMasterTextureLimit: 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: iPhone
+    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: Android
+    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: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/WildAttack/Resources/UI/MainPanel.prefab

@@ -35,7 +35,7 @@ RectTransform:
   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: -1.4890099, y: 17.627998}
+  m_AnchoredPosition: {x: -1.4890137, y: 17.627998}
   m_SizeDelta: {x: 53.877, y: 53.503}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5292908374790744127
@@ -398,7 +398,7 @@ RectTransform:
   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: -1.4890099, y: 17.627998}
+  m_AnchoredPosition: {x: -1.4890137, y: 17.627998}
   m_SizeDelta: {x: 53.877, y: 53.503}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4301398470277020816
@@ -851,12 +851,12 @@ RectTransform:
   m_Children:
   - {fileID: 6131482592890568079}
   - {fileID: 5741345248361449158}
-  m_Father: {fileID: 6012519488922156835}
-  m_RootOrder: 10
+  m_Father: {fileID: 3007498705972272059}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -83, y: 245}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 80, y: -168.5}
   m_SizeDelta: {x: 80, y: 100}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &8019124220295209902
@@ -1005,8 +1005,8 @@ RectTransform:
   m_GameObject: {fileID: 3915393438978726778}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 3, y: 3, z: 3}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1996560620015308219}
   m_Father: {fileID: 6012519489348195314}
@@ -1014,8 +1014,8 @@ RectTransform:
   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: -32, y: -32}
+  m_AnchoredPosition: {x: 0, y: 0.20000076}
+  m_SizeDelta: {x: -56.6, y: -56.399998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8557950394647970851
 CanvasRenderer:
@@ -1045,7 +1045,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ef2edea59828bb143909f06c946097c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3948faa2072080f4bb1e644c6cf00a70, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1068,6 +1068,71 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!1 &4238980600816216558
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3007498705972272059}
+  - component: {fileID: 6487891463965437727}
+  m_Layer: 5
+  m_Name: Bottom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3007498705972272059
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4238980600816216558}
+  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: 651657459685220365}
+  - {fileID: 8847762697108370772}
+  m_Father: {fileID: 6012519488922156835}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -83, y: 40}
+  m_SizeDelta: {x: 80, y: 337}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &6487891463965437727
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4238980600816216558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 7
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &4989878517940502022
 GameObject:
   m_ObjectHideFlags: 0
@@ -1476,9 +1541,9 @@ RectTransform:
   m_Father: {fileID: 6012519488922156835}
   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: -1035.0774, y: 504.737}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 230.9226, y: -80.263}
   m_SizeDelta: {x: 227.2312, y: 122.19299}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5410056360022089356
@@ -1590,12 +1655,12 @@ RectTransform:
   m_Children:
   - {fileID: 8934383144794930793}
   - {fileID: 1960317994781157221}
-  m_Father: {fileID: 6012519488922156835}
-  m_RootOrder: 11
+  m_Father: {fileID: 3007498705972272059}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -83, y: 58}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 80, y: -337}
   m_SizeDelta: {x: 80, y: 100}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &661024789329839848
@@ -1717,7 +1782,7 @@ RectTransform:
   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.9469948, y: -26.279}
+  m_AnchoredPosition: {x: -0.94699097, y: -26.278992}
   m_SizeDelta: {x: 98.107, y: 28.943}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &454657374242642389
@@ -1789,7 +1854,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: CalibrationOffset1P
+  textKey: CalibrationOffset
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
 --- !u!1 &6012519488554307374
@@ -2917,8 +2982,7 @@ RectTransform:
   - {fileID: 6012519490406549090}
   - {fileID: 6012519489111160643}
   - {fileID: 6012519489998635840}
-  - {fileID: 651657459685220365}
-  - {fileID: 8847762697108370772}
+  - {fileID: 3007498705972272059}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4310,7 +4374,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ef2edea59828bb143909f06c946097c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ade7399573ba9d548a71d4edf055011c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7833,7 +7897,7 @@ RectTransform:
   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.9469948, y: -26.279}
+  m_AnchoredPosition: {x: -0.94699097, y: -26.278992}
   m_SizeDelta: {x: 98.107, y: 28.943}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1318399321208860776

Assets/WildAttack/Scripts/UI/MainPanel.cs

@@ -189,7 +189,7 @@ namespace WildAttack
                         AudioMgr.ins.PlayBtn();
                         OnClick_ResetAim();
                     });
-                    if (_btnCalibrationOffset_2P) {
+                    if (CommonConfig.bDisplayTwoPlayerGames && _btnCalibrationOffset_2P) {
                         _btnCalibrationOffset_2P.gameObject.SetActive(true);
                         _btnCalibrationOffset_2P.onClick.AddListener(delegate ()
                         {

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: JssF
-  productName: "WONDERFITTER Pro \u8FD0\u52A8"
+  productName: WONDER FITTER Pro
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -158,7 +158,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.xmjssvr.BowArrow.mi
+    Android: com.xmjssvr.BowArrowEn
     Standalone: com.JssF.BowArrow
     iPhone: com.xmjssvr.PadBowArrowEn
   buildNumber:
@@ -279,7 +279,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: e1485575cd9962247a6d7cc46fd6d6a9, type: 3}
+      m_Icon: {fileID: 2800000, guid: 5a86b450fbbf31f4d9269beac3ccd441, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0