Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

2023-06-21 14:17:42 +08:00 · 2023-06-21 14:17:42 +08:00 · 1db8fc4f28
commit 1db8fc4f28
parent 45b92fde2b 420d627962
17 changed files with 18 additions and 14 deletions
--- a/Assets/Editor/JenkinsAdapter.cs
+++ b/Assets/Editor/JenkinsAdapter.cs
@ -63,6 +63,10 @@ public class JenkinsAdapter {
        PlayerSettings.iOS.targetOSVersionString = "12.0";
        //设置Build，每次需要增加
        PlayerSettings.iOS.buildNumber = "2";
+        // 隐藏ios的横条
+        PlayerSettings.iOS.hideHomeButton = true;
+        // 禁止在所有边缘上延迟手势
+        PlayerSettings.iOS.deferSystemGesturesMode = UnityEngine.iOS.SystemGestureDeferMode.All;

        // 设置竖屏
        PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
--- a/Assets/arts/spines/characters/m10066/m10066.atlas.txt.meta
+++ b/Assets/arts/spines/characters/m10066/m10066.atlas.txt.meta
@ -3,5 +3,5 @@ guid: d420a71f1c7707d42bd430a1841e5856
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10066/m10066.png.meta
+++ b/Assets/arts/spines/characters/m10066/m10066.png.meta
@ -116,5 +116,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10066/m10066.skel.bytes.meta
+++ b/Assets/arts/spines/characters/m10066/m10066.skel.bytes.meta
@ -3,5 +3,5 @@ guid: 466fcbb82d007664390f1d092c51a8f6
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10066/m10066_atlas.asset.meta
+++ b/Assets/arts/spines/characters/m10066/m10066_atlas.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10066/m10066_material.mat.meta
+++ b/Assets/arts/spines/characters/m10066/m10066_material.mat.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10066/m10066_skeletondata.asset.meta
+++ b/Assets/arts/spines/characters/m10066/m10066_skeletondata.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10066.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067.atlas.txt.meta
+++ b/Assets/arts/spines/characters/m10067/m10067.atlas.txt.meta
@ -3,5 +3,5 @@ guid: fdc6790c6d26140499af658c115ed56c
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067.png.meta
+++ b/Assets/arts/spines/characters/m10067/m10067.png.meta
@ -116,5 +116,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067.skel.bytes.meta
+++ b/Assets/arts/spines/characters/m10067/m10067.skel.bytes.meta
@ -3,5 +3,5 @@ guid: be4493aaeea628345be2625d2c842dd7
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067_atlas.asset.meta
+++ b/Assets/arts/spines/characters/m10067/m10067_atlas.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067_material.mat.meta
+++ b/Assets/arts/spines/characters/m10067/m10067_material.mat.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/arts/spines/characters/m10067/m10067_skeletondata.asset.meta
+++ b/Assets/arts/spines/characters/m10067/m10067_skeletondata.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: 
+  assetBundleName: arts/spines/characters/m10067.ab
  assetBundleVariant: 
--- a/Assets/lua/app/config/monster_dungeon_shards.lua.bytes
+++ b/Assets/lua/app/config/monster_dungeon_shards.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/prefabs/spine/ui/characters/m10066.prefab.meta
+++ b/Assets/prefabs/spine/ui/characters/m10066.prefab.meta
@ -3,5 +3,5 @@ guid: 69907e06db6952142b15d81ec39a8dba
 PrefabImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: prefabs/spine/ui/characters/m10064.prefab.ab
+  assetBundleName: prefabs/spine/ui/characters/m10066.prefab.ab
  assetBundleVariant: 
--- a/Assets/prefabs/spine/ui/characters/m10067.prefab.meta
+++ b/Assets/prefabs/spine/ui/characters/m10067.prefab.meta
@ -3,5 +3,5 @@ guid: 3ed1fe02498273a4e9558f297beae72c
 PrefabImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: prefabs/spine/ui/characters/m10064.prefab.ab
+  assetBundleName: prefabs/spine/ui/characters/m10067.prefab.ab
  assetBundleVariant: