Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-06-25 15:44:48 +08:00
commit c3cf51d2fb
5 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: b32790f8ea235b4428bed8bc3d672b71
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: c0515c8eb328aac4ea3804eb56381fb9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -24,7 +24,7 @@ public class UIBgAdaptive : MonoBehaviour
//float curHeight = 1920 * (Screen.height / Screen.width) / (1920 / 1080);
//float curWidth = (1080f / 1920f) * curHeight;
//bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, curHeight);
if (Screen.height >= 1920)
if (Screen.height/Screen.width >= 1920/1080f)
{
//--计算比例因子 比例因子 = 10 ^ ((lg(屏幕宽 / 开发宽) + lg(屏幕高 / 开发高) / 2))
//local log = math.log(Screen.width / 1080, 10) + math.log(Screen.height / 1920, 10)