xiaohui.wang
|
332ecc8901
|
Merge commit '7b224dab5735239a8687b5f2086eeebdba0978cc' into joypac_OS
# Conflicts:
# popcorn/Assets/GameAnalytics/Plugins/Prefabs/GameAnalytics.prefab
# popcorn/Assets/IronSource/DemoScene/IronSourceDemoScript.cs
# popcorn/Assets/IronSource/Editor/IronSourceBuildPostprocessor.cs
# popcorn/Assets/IronSource/Editor/IronSourceDependenciesManager.cs
# popcorn/Assets/IronSource/Editor/IronSourceEditorCoroutines.cs.meta
# popcorn/Assets/IronSource/Editor/IronSourceManifestProcessor.cs
# popcorn/Assets/IronSource/Editor/IronSourceManifestProcessor.cs.meta
# popcorn/Assets/IronSource/Editor/IronSourceMenu.cs.meta
# popcorn/Assets/IronSource/Editor/IronSourcePlistProcessor.cs.meta
# popcorn/Assets/IronSource/Editor/IronSourceSDKDependencies.xml
# popcorn/Assets/IronSource/Plugins/Android/IronSource.plugin/AndroidManifest.xml
# popcorn/Assets/IronSource/Plugins/Android/IronSource.plugin/libs/android-bridge.jar
# popcorn/Assets/IronSource/Plugins/iOS/iOSBridge.h
# popcorn/Assets/IronSource/Plugins/iOS/iOSBridge.m
# popcorn/Assets/IronSource/Scripts/AndroidAgent.cs
# popcorn/Assets/IronSource/Scripts/AndroidAgent.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSource.cs
# popcorn/Assets/IronSource/Scripts/IronSource.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceConfig.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceConstants.cs
# popcorn/Assets/IronSource/Scripts/IronSourceConstants.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceError.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceEvents.cs
# popcorn/Assets/IronSource/Scripts/IronSourceEvents.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceIAgent.cs
# popcorn/Assets/IronSource/Scripts/IronSourceIAgent.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceImpressionData.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceInitilizer.cs
# popcorn/Assets/IronSource/Scripts/IronSourceInitilizer.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceJSON.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceMediationSettings.cs
# popcorn/Assets/IronSource/Scripts/IronSourcePlacement.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceSegment.cs.meta
# popcorn/Assets/IronSource/Scripts/IronSourceUtils.cs.meta
# popcorn/Assets/IronSource/Scripts/UnsupportedPlatformAgent.cs
# popcorn/Assets/IronSource/Scripts/UnsupportedPlatformAgent.cs.meta
# popcorn/Assets/IronSource/Scripts/iOSAgent.cs
# popcorn/Assets/IronSource/Scripts/iOSAgent.cs.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/Android/adjust-android.jar.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/ADJAttribution.h.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/AdjustUnity.mm.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/BannerLevelPlayCallbacksWrapper.h
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/BannerLevelPlayCallbacksWrapper.h.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/BannerLevelPlayCallbacksWrapper.m
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/BannerLevelPlayCallbacksWrapper.m.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/InterstitialLevelPlayCallbacksWrapper.h
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/InterstitialLevelPlayCallbacksWrapper.h.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/InterstitialLevelPlayCallbacksWrapper.m
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/InterstitialLevelPlayCallbacksWrapper.m.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/RewardedVideoLevelPlayCallbacksWrapper.h
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/RewardedVideoLevelPlayCallbacksWrapper.h.meta
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/RewardedVideoLevelPlayCallbacksWrapper.m
# popcorn/Assets/JoyPacSDK/Ga_Adjust/Adjust/iOS/RewardedVideoLevelPlayCallbacksWrapper.m.meta
# popcorn/Assets/JoyPacSDK/Umeng/Plugins/iOS/CSSDK/libUMUnityAnalytics.a.meta
# popcorn/Assets/Joypac/Editor/JoypacI2AttPostBuild.cs.meta
# popcorn/Assets/Joypac/Plugins/Android/libs/unityUmengBridge.jar.meta
# popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar.meta
# popcorn/Assets/Joypac/Plugins/iOS/JPCross/JPCross.framework/JPCross.meta
# popcorn/Assets/Joypac/Plugins/iOS/JPThird/JoypacInterface.mm.meta
# popcorn/Assets/Joypac/Purchase/ISAdMobAdapterDependencies.xml
# popcorn/Assets/Joypac/Purchase/ISAdMobAdapterDependencies.xml.meta
# popcorn/Assets/Joypac/Purchase/ISPangleAdapterDependencies.xml
# popcorn/Assets/Joypac/Purchase/ISPangleAdapterDependencies.xml.meta
# popcorn/Assets/Joypac/Purchase/ISUnityAdsAdapterDependencies.xml
# popcorn/Assets/Joypac/Purchase/ISUnityAdsAdapterDependencies.xml.meta
# popcorn/Assets/Joypac/Purchase/IronSourceDependenciesManagerConstants.cs
# popcorn/Assets/Joypac/Purchase/IronSourceDependenciesManagerConstants.cs.meta
# popcorn/Assets/Joypac/Purchase/JoypacIAP.cs.meta
# popcorn/Assets/Joypac/Purchase/JoypacIAPButton.cs.meta
# popcorn/Assets/Joypac/Resources.meta
# popcorn/Assets/Joypac/Resources/IronSourceMediatedNetworkSettings.asset
# popcorn/Assets/Joypac/Resources/IronSourceMediatedNetworkSettings.asset.meta
# popcorn/Assets/Joypac/Resources/IronSourceMediationSettings.asset
# popcorn/Assets/Joypac/Resources/IronSourceMediationSettings.asset.meta
# popcorn/Assets/Joypac/Scripts/IUnityBanner.cs
# popcorn/Assets/Joypac/Scripts/IUnityBanner.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityImpressionData.cs
# popcorn/Assets/Joypac/Scripts/IUnityImpressionData.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityInitialization.cs
# popcorn/Assets/Joypac/Scripts/IUnityInitialization.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityInterstitial.cs
# popcorn/Assets/Joypac/Scripts/IUnityInterstitial.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayBanner.cs
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayBanner.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayInterstitial.cs
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayInterstitial.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayRewardedVideo.cs
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayRewardedVideo.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayRewardedVideoManual.cs
# popcorn/Assets/Joypac/Scripts/IUnityLevelPlayRewardedVideoManual.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityOfferwall.cs
# popcorn/Assets/Joypac/Scripts/IUnityOfferwall.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityRewardedVideo.cs
# popcorn/Assets/Joypac/Scripts/IUnityRewardedVideo.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnityRewardedVideoManual.cs
# popcorn/Assets/Joypac/Scripts/IUnityRewardedVideoManual.cs.meta
# popcorn/Assets/Joypac/Scripts/IUnitySegment.cs
# popcorn/Assets/Joypac/Scripts/IUnitySegment.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceAdInfo.cs
# popcorn/Assets/Joypac/Scripts/IronSourceAdInfo.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceBannerAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceBannerAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceBannerEvents.cs
# popcorn/Assets/Joypac/Scripts/IronSourceBannerEvents.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceBannerLevelPlayAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceBannerLevelPlayAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceEventsDispatcher.cs
# popcorn/Assets/Joypac/Scripts/IronSourceEventsDispatcher.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceImpressionDataAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceImpressionDataAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceInitializationAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceInitializationAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialEvents.cs
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialEvents.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialLevelPlayAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceInterstitialLevelPlayAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceOfferwallAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceOfferwallAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoEvents.cs
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoEvents.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoLevelPlayAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoLevelPlayAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoLevelPlayManualAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoLevelPlayManualAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoManualAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceRewardedVideoManualAndroid.cs.meta
# popcorn/Assets/Joypac/Scripts/IronSourceSegmentAndroid.cs
# popcorn/Assets/Joypac/Scripts/IronSourceSegmentAndroid.cs.meta
# popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
# popcorn/Assets/MyGame/Scenes/Main/Main.unity
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
# popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs
# popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
# popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs
# popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
# popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab
# popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
# popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
# popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs
# popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
# popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
# popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs
# popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
# popcorn/Assets/MyGame/Scripts/AdManager.cs
# popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs
# popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs
# popcorn/Assets/Plugins/Android/AndroidManifest.xml
# popcorn/Assets/Plugins/Android/androidx.activity.activity-1.2.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta
# popcorn/Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.appcompat.appcompat-1.1.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta
# popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta
# popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta
# popcorn/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.5.10.jar
# popcorn/Assets/Resources/BillingMode.json.meta
# popcorn/Assets/Resources/GameAnalytics/Settings.asset
# popcorn/Assets/Resources/I2Languages.asset
# popcorn/Assets/StreamingAssets.meta
# popcorn/Assets/StreamingAssets/StringKey_iOS.json.meta
# popcorn/Assets/USAYAUnityLib/Editor/DevelopmentBuilder.cs
# popcorn/Assets/csc.rsp.meta
# popcorn/ProjectSettings/AndroidResolverDependencies.xml
# popcorn/ProjectSettings/ProjectSettings.asset
|
2023-01-31 10:41:25 +08:00 |
kimura
闫婷婷
水谷圭吾