xiaohui.wang
|
8f6c6b9784
|
新版unity安卓打包
|
2023-02-06 10:01:17 +08:00 |
|
xiaohui.wang
|
23148065f2
|
解决新手引导失败玉米出现负数
|
2023-02-03 16:30:05 +08:00 |
|
xiaohui.wang
|
acbd1d959f
|
补充日志
|
2023-02-03 14:45:29 +08:00 |
|
xiaohui.wang
|
40395bd895
|
视频改为5次配方
|
2023-02-02 19:17:30 +08:00 |
|
xiaohui.wang
|
8bdb2cb90e
|
引导
|
2023-02-02 19:15:41 +08:00 |
|
xiaohui.wang
|
a85dd59676
|
引导多次无金币修改
|
2023-02-02 19:15:12 +08:00 |
|
xiaohui.wang
|
4771b11a91
|
项目设置更新
|
2023-02-02 16:34:26 +08:00 |
|
xiaohui.wang
|
d6d56fa64a
|
还原jpsdk
|
2023-02-02 14:34:25 +08:00 |
|
xiaohui.wang
|
3a056c4d41
|
打点
|
2023-02-02 11:37:57 +08:00 |
|
xiaohui.wang
|
69248ea6d3
|
翻译
|
2023-02-02 10:31:27 +08:00 |
|
xiaohui.wang
|
ae4fe99af2
|
代码合并错误，历史bug排查修改
|
2023-02-01 18:32:03 +08:00 |
|
xiaohui.wang
|
1f3391dbf1
|
UI引用修改
|
2023-02-01 16:18:09 +08:00 |
|
xiaohui.wang
|
6abae508a3
|
基础合并
|
2023-02-01 15:49:22 +08:00 |
|
xiaohui.wang
|
5586b0d5c9
|
joypac文件还原
|
2023-01-31 12:24:46 +08:00 |
|
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 |
すとう
|
7b224dab57
|
マージ先 feature/1.7.0 (プルリクエスト #9)
Feature/1.7.0
|
2022-12-19 07:53:08 +00:00 |
|
atusi
|
ce63db9adc
|
update I2Languages 1.7.0
|
2022-12-19 16:41:04 +09:00 |
水谷圭吾
|
60091b4db9
|
スプレッドシート更新
|
2022-12-09 13:42:00 +09:00 |
|
水谷圭吾
|
529f50b60d
|
スプレッドシート更新
|
2022-12-09 12:46:22 +09:00 |
koya_15
|
c9b51e8cf5
|
レシピPOP再調整
|
2022-12-08 10:59:07 +09:00 |
|
koya_15
|
4756f6800e
|
レシピPOP調整
|
2022-12-08 10:57:15 +09:00 |
kimura
|
0d2284ddbb
|
材料チェック修正
|
2022-12-07 17:22:00 +09:00 |
|
koya_15
|
189958ebb8
|
最低投資額画像数字修正
|
2022-12-07 11:02:51 +09:00 |
|
kimura
|
6cd96f00c8
|
都市開放演出時に閉じるボタン無効化
|
2022-12-06 18:01:12 +09:00 |
|
kimura
|
d034e55228
|
都市レベルアップ時にミッションチェックを追加
|
2022-12-06 18:00:50 +09:00 |
|
kimura
|
e5f0528d0b
|
IronSourceBuildPostprocessor.cs のstorekit記述削除
|
2022-12-06 16:21:39 +09:00 |
|
kimura
|
1b368ad11b
|
共通ミッション修正
|
2022-12-06 16:03:44 +09:00 |
|
kimura
|
a6125c289d
|
共通ミッション周り修正
|
2022-12-06 15:26:09 +09:00 |
|
水谷圭吾
|
750b5166bc
|
スプレッドシート更新
|
2022-12-06 10:30:21 +09:00 |
|
水谷圭吾
|
28aa71f6d2
|
スプレッドシート更新
|
2022-12-06 09:51:38 +09:00 |
|
kimura
|
fffa92da95
|
ミッション進捗チェック修正
|
2022-12-05 18:02:18 +09:00 |
|
kimura
|
c31f53f3d6
|
バイト君の羽リワード修正
|
2022-12-05 13:05:27 +09:00 |
|
kimura
|
00f018ad53
|
ダイアログ修正
|
2022-12-05 11:24:24 +09:00 |
|
kimura
|
e7e34f99fd
|
デバッグ機能修正
|
2022-12-05 09:45:20 +09:00 |
|
kimura
|
996e75a17f
|
ヘッダーのワールドマップボタンロック表示追加
|
2022-12-05 09:43:12 +09:00 |
|
kimura
|
a9426fc30d
|
サンフランシスコ都市店舗レベル2のときアップデート待ってねポップ表示
|
2022-12-05 09:42:00 +09:00 |
|
kimura
|
1c2673d766
|
バイト君の羽の付与条件を追加
|
2022-12-02 20:40:08 +09:00 |
|
kimura
|
e77e78ad1a
|
店舗レベルでの会話表示を修正
|
2022-12-02 20:17:16 +09:00 |
|
kimura
|
f96c59fc2f
|
都市の店舗レベル設定修正
|
2022-12-02 20:15:25 +09:00 |
|
kimura
|
4eb2eb46f7
|
ワールドマップチュートリアル表示追加
マップ移動制限表示追加
|
2022-12-02 19:43:26 +09:00 |
|
kimura
|
0677320d0e
|
シート更新
|
2022-12-02 19:40:14 +09:00 |
|
kimura
|
9868c7b39e
|
マーケットの初回表示を修正
|
2022-12-02 19:14:21 +09:00 |
|
kimura
|
328287b036
|
新都市開放時の初期パラメータ追加
|
2022-12-02 19:11:54 +09:00 |
|
kimura
|
5f384849b6
|
資金投入単位を変更
|
2022-12-02 18:50:39 +09:00 |
|
kimura
|
59fd162d78
|
refactor
|
2022-12-02 18:50:39 +09:00 |
|
kimura
|
9c1ca1ddf9
|
資金調達完了表示対応
|
2022-12-02 18:50:39 +09:00 |
|
kimura
|
56d656ed41
|
マーケット初回表示対応
|
2022-12-02 18:50:39 +09:00 |
|
水谷圭吾
|
1da46055c4
|
スプレッドシート更新
|
2022-12-02 18:49:48 +09:00 |
|
kimura
|
617cd8e0ef
|
シート更新
|
2022-12-02 18:18:24 +09:00 |
|
kimura
|
b1df88aea8
|
都市開放修正
|
2022-12-02 18:18:14 +09:00 |