yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
atusi 2022-01-19 20:07:21 +09:00
parent cbecd3c9fb ed455f94a0
commit 923cc17bfa
19 changed files with 127 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
popcorn/Assets/MyGame/Editor/PostProcessor.cs
View File

@ -28,7 +28,8 @@ public static class PostProcessor{
PBXProject pj = new PBXProject ();
pj.ReadFromString(File.ReadAllText(projectPath));
var target = pj.GetUnityMainTargetGuid();
var target = pj.GetUnityFrameworkTargetGuid();
pj.SetBuildProperty (target, "ENABLE_BITCODE", "NO");
// Enable Modules (C and Objective-C)をYESに設定する
pj.SetBuildProperty(target, "CLANG_ENABLE_MODULES", "YES");
@ -90,6 +91,8 @@ public static class PostProcessor{
pj.AddFrameworkToProject(target, "AdSupport.framework", false);
pj.AddFrameworkToProject(target, "iAd.framework", false);
var target2 = pj.GetUnityMainTargetGuid();
foreach (KeyValuePair<string, Dictionary<string, string>> entry in appTextMap) {
string appNameConverted = "";
@ -122,7 +125,7 @@ public static class PostProcessor{
w.Close();
string fileGuid = pj.AddFile( Path.Combine(path, lprojDir), "/"+lprojDir, PBXSourceTree.Source );
pj.AddFileToBuild( target, fileGuid );
pj.AddFileToBuild( target2, fileGuid );
pj.WriteToFile( projectPath );
}

1
popcorn/Assets/Plugins/Android/AndroidManifest.xml
View File

@ -7,7 +7,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<application>
<activity android:name="com.unity3d.player.UnityPlayerActivity"

8
popcorn/Assets/Plugins/Android/res.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 706e6b01dca2641eaacb36d756f62e8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
popcorn/Assets/Plugins/Android/res/values-ja.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd896ed7c0b3040d99168c08f3e6f1f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
popcorn/Assets/Plugins/Android/res/values-ja/strings.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">ポップコーン</string>
</resources>

7
popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 00dc986b1e1fc4a1c996eb398f09435f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
popcorn/Assets/Plugins/Android/res/values.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a0639bc78e2c742ad90bb7fd9209bffd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
popcorn/Assets/Plugins/Android/res/values/strings.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Popcorn</string>
</resources>

7
popcorn/Assets/Plugins/Android/res/values/strings.xml.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6ab92f99912824a619ebfd3d5d4ceb25
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
popcorn/Assets/Plugins/Android/res/values/version.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="google_play_services_version">12451000</integer>
</resources>

7
popcorn/Assets/Plugins/Android/res/values/version.xml.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8580f3463016e4f4c9801df8f4758dd6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
popcorn/Assets/Plugins/Android/res/xml.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e91468763bc7644208d37eee8786052e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5
popcorn/Assets/Plugins/Android/res/xml/file_paths.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<!--<external-path name="external_files" path="."/>-->
<external-files-path name="external_files_path" path="Download" />
</paths>

7
popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta Normal file
View File

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

17
popcorn/Assets/Resources/GameAnalytics/Settings.asset
View File

@ -32,8 +32,8 @@ MonoBehaviour:
- d078eab3b8d4a6b44ccfb7d9258a8e0bddad1337
- 41e0f225a9f8751a3fc893cae6eb933df7d0214e
Build:
- 0.1
- 0.1
- 1.0.1
- 1.0.0
SelectedPlatformOrganization:
- usaya
- usaya
@ -47,8 +47,17 @@ MonoBehaviour:
SelectedOrganization: 0300000003000000
SelectedStudio: 0100000001000000
SelectedGame: 0500000006000000
NewVersion:
Changes:
NewVersion: 7.3.2
Changes: '7.3.2
- fixed missing custom event fields for when trying to fix
missing session end events
7.3.1
- fixed editor ui bug with games
with the same name'
SignUpOpen: 1
StudioName: jp.usaya
GameName: popcorn

6
popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs
View File

@ -9,8 +9,8 @@ public class DevelopmentBuilder : IPreprocessBuildWithReport {
}
public void OnPreprocessBuild(BuildReport report) {
UnityEditor.EditorUserBuildSettings.development = true;
UnityEditor.EditorUserBuildSettings.iOSBuildConfigType = UnityEditor.iOSBuildType.Debug;
UnityEditor.AssetDatabase.SaveAssets();
// UnityEditor.EditorUserBuildSettings.development = true;
// UnityEditor.EditorUserBuildSettings.iOSBuildConfigType = UnityEditor.iOSBuildType.Debug;
// UnityEditor.AssetDatabase.SaveAssets();
}
}

1
popcorn/ProjectSettings/GraphicsSettings.asset
View File

@ -34,6 +34,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

8
popcorn/ProjectSettings/GvhProjectSettings.xml
View File

@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<projectSettings>
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
<projectSetting name="Google.IOSResolver.AutoPodToolInstallInEditor" value="True" />
<projectSetting name="Google.IOSResolver.CocoapodsIntegrationMethod" value="1" />
<projectSetting name="Google.IOSResolver.PodfileAddUseFrameworks" value="True" />
<projectSetting name="Google.IOSResolver.PodfileAllowPodsInMultipleTargets" value="True" />
<projectSetting name="Google.IOSResolver.PodfileAlwaysAddMainTarget" value="True" />
<projectSetting name="Google.IOSResolver.PodfileEnabled" value="True" />
<projectSetting name="Google.IOSResolver.PodfileStaticLinkFrameworks" value="False" />
<projectSetting name="Google.IOSResolver.PodToolExecutionViaShellEnabled" value="True" />
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />

29
popcorn/ProjectSettings/ProjectSettings.asset
View File

@ -18,7 +18,7 @@ PlayerSettings:
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_ShowUnitySplashLogo: 0
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 0
m_SplashScreenLogoStyle: 0
@ -127,7 +127,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.1
bundleVersion: 1.0.0
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -174,7 +174,7 @@ PlayerSettings:
Android: jp.usaya.popcorn
iPhone: jp.usaya.popcorn
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidBundleVersionCode: 2
AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
@ -252,15 +252,15 @@ PlayerSettings:
AndroidTargetArchitectures: 2
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidKeystoreName: /Users/sutoatsushi/Develop/usaya/___apk_files/popcorn/key/popcorn.keystore
AndroidKeyaliasName: usaya
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 0
AndroidIsGame: 1
AndroidEnableTango: 0
androidEnableBanner: 1
androidUseLowAccuracyLocation: 0
androidUseCustomKeystore: 0
androidUseCustomKeystore: 1
m_AndroidBanners:
- width: 320
height: 180
@ -749,11 +749,22 @@ PlayerSettings:
webGLThreadsSupport: 0
webGLWasmStreaming: 0
scriptingDefineSymbols:
4: gameanalytics_ironsource_enabled
7: gameanalytics_ironsource_enabled
1: TextMeshPro
4: gameanalytics_ironsource_enabled;TextMeshPro
7: gameanalytics_ironsource_enabled;TextMeshPro
13: TextMeshPro
14: TextMeshPro
19: TextMeshPro
21: TextMeshPro
25: TextMeshPro
27: TextMeshPro
28: TextMeshPro
29: TextMeshPro
30: TextMeshPro
platformArchitecture:
iPhone: 1
scriptingBackend: {}
scriptingBackend:
Android: 1
il2cppCompilerConfiguration: {}
managedStrippingLevel: {}
incrementalIl2cppBuild: {}