puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiekaidong 2023-06-21 14:17:42 +08:00
commit 1db8fc4f28
17 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Editor/JenkinsAdapter.cs
View File

@ -63,6 +63,10 @@ public class JenkinsAdapter {
PlayerSettings.iOS.targetOSVersionString = "12.0"; PlayerSettings.iOS.targetOSVersionString = "12.0";
//设置Build，每次需要增加 //设置Build，每次需要增加
PlayerSettings.iOS.buildNumber = "2"; PlayerSettings.iOS.buildNumber = "2";
// 隐藏ios的横条
PlayerSettings.iOS.hideHomeButton = true;
// 禁止在所有边缘上延迟手势
PlayerSettings.iOS.deferSystemGesturesMode = UnityEngine.iOS.SystemGestureDeferMode.All;
// 设置竖屏 // 设置竖屏
PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait; PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;

2
Assets/arts/spines/characters/m10066/m10066.atlas.txt.meta
View File

@ -3,5 +3,5 @@ guid: d420a71f1c7707d42bd430a1841e5856
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10066/m10066.png.meta
View File

@ -116,5 +116,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10066/m10066.skel.bytes.meta
View File

@ -3,5 +3,5 @@ guid: 466fcbb82d007664390f1d092c51a8f6
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10066/m10066_atlas.asset.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10066/m10066_material.mat.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 2100000 mainObjectFileID: 2100000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10066/m10066_skeletondata.asset.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10066.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067.atlas.txt.meta
View File

@ -3,5 +3,5 @@ guid: fdc6790c6d26140499af658c115ed56c
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067.png.meta
View File

@ -116,5 +116,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067.skel.bytes.meta
View File

@ -3,5 +3,5 @@ guid: be4493aaeea628345be2625d2c842dd7
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067_atlas.asset.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067_material.mat.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 2100000 mainObjectFileID: 2100000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

2
Assets/arts/spines/characters/m10067/m10067_skeletondata.asset.meta
View File

@ -4,5 +4,5 @@ NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName: arts/spines/characters/m10067.ab
assetBundleVariant: assetBundleVariant:

BIN
Assets/lua/app/config/monster_dungeon_shards.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/config/skill.lua.bytes
View File

Binary file not shown.

2
Assets/prefabs/spine/ui/characters/m10066.prefab.meta
View File

@ -3,5 +3,5 @@ guid: 69907e06db6952142b15d81ec39a8dba
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: prefabs/spine/ui/characters/m10064.prefab.ab assetBundleName: prefabs/spine/ui/characters/m10066.prefab.ab
assetBundleVariant: assetBundleVariant:

2
Assets/prefabs/spine/ui/characters/m10067.prefab.meta
View File

@ -3,5 +3,5 @@ guid: 3ed1fe02498273a4e9558f297beae72c
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: prefabs/spine/ui/characters/m10064.prefab.ab assetBundleName: prefabs/spine/ui/characters/m10067.prefab.ab
assetBundleVariant: assetBundleVariant: