Commit Graph

2569 Commits

Author SHA1 Message Date
闫婷婷 0c8f95d873 adjust 补充 2022-06-21 11:02:53 +08:00
闫婷婷 daff8a7804 海外 2022-06-21 11:02:43 +08:00
闫婷婷 12d8507c14 .meta 2022-06-21 11:02:06 +08:00
kimura 87f562552f add シーンリロード(デバッグ) fixポイント追加処理 2022-06-20 18:30:25 +09:00
kimura aa08a62cdc add 障害物prefab 2022-06-20 18:29:11 +09:00
kimura 4699751029 add 障害物 2022-06-20 18:28:21 +09:00
闫婷婷 1e4edef887 jpsdk 1.1.36 2022-06-20 16:16:15 +08:00
闫婷婷 2f6d43fd29 pangle海外 2022-06-20 16:14:16 +08:00
闫婷婷 5096cfb596 翻译 2022-06-20 16:13:58 +08:00
闫婷婷 3ddb119348 finder 海外 2022-06-20 16:13:35 +08:00
kimura 0ab01fa7a3 change protoPrefab 2022-06-20 15:28:21 +09:00
kimura b3e34343cc add debug 2022-06-20 15:27:40 +09:00
kimura d83a12f741 change gamemanager 2022-06-20 15:27:07 +09:00
kimura 9fcb809215 add scrollGameData class 2022-06-20 15:25:58 +09:00
kimura 743ed91ab1 add view class 2022-06-20 15:24:11 +09:00
闫婷婷 5dfc6c5692 add trans i2 2022-06-17 16:42:55 +08:00
闫婷婷 9dac7889c3 替换 i2 2022-06-17 16:41:35 +08:00
闫婷婷 037e43aa75 2022-06-17 10:57:21 +08:00
闫婷婷 e420a76c9e 去掉特殊符号 2022-06-17 10:52:51 +08:00
闫婷婷 5d59acd808 切换为海外ios 2022-06-17 10:50:59 +08:00
闫婷婷 fddf7d53ff remove 隐私协议 2022-06-17 10:15:10 +08:00
闫婷婷 451168576b - 2022-06-17 09:57:04 +08:00
闫婷婷 07431d3cf8 .meta 2022-06-17 09:56:42 +08:00
闫婷婷 138727184f path 2022-06-17 09:56:18 +08:00
闫婷婷 d240dd7333 reset to ”隐私协议“ 1ed73 2022-06-16 16:11:48 +08:00
闫婷婷 8efe3be870 reset to "修改显示bug“ 088684d7 2022-06-16 16:09:31 +08:00
闫婷婷 3ec8ba598a # popcorn/Assets/MyGame/Scenes/CornField/CornField.unity 金币推送
# popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab 开发者版本
# popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity 开发者版本,需要增加隐私协议,国内
# popcorn/Assets/MyGame/Scenes/marketing/Customize.unity 开发者版本
# popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity 开发者版本
# popcorn/Assets/MyGame/Scenes/shopping/shopping.unity 开发者版本,其中有个晓辉改的修改显示bug不知道是什么
# popcorn/Assets/Resources/I2Languages.asset 开发者版本
2022-06-16 14:46:57 +08:00
闫婷婷 d543a98c6d Merge commit '4013289d7095cb8fe9b19ea8113083ae5ce3ae37' into release_joypac
# Conflicts:
#	popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
#	popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab
#	popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity
#	popcorn/Assets/MyGame/Scenes/marketing/Customize.unity
#	popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity
#	popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
#	popcorn/Assets/Resources/I2Languages.asset
2022-06-16 14:20:44 +08:00
kimura d92b322ab2 仮Game部分 Prefab化 2022-06-14 16:21:02 +09:00
atusi 4013289d70 fix English UI text size 2022-06-14 13:54:34 +09:00
atusi f3df255f28 fix English UI text size 2022-06-14 13:11:29 +09:00
kimura f77c60b67c add timer 2022-06-14 10:26:09 +09:00
kimura e14bf163c5 fix 紐付け 2022-06-14 09:58:46 +09:00
kimura 9c171e2db1 add miniGame 2022-06-14 09:52:00 +09:00
koya_15 db71e1ee42 あてはめ調整 2022-06-13 14:41:35 +09:00
koya_15 1f786bdb32 あてはめ確認 2022-06-13 14:32:42 +09:00
koya_15 ae6efe14bc 英語翻訳画像あてはめ 2022-06-13 10:00:43 +09:00
koya_15 8cb2d7b035 英語翻訳画像取り込み、あてはめ途中 2022-06-10 15:56:45 +09:00
kimura 79aa7e94d1 add 販売処理エラー制御&ログ出力 2022-06-10 15:47:20 +09:00
kimura 6bc95c32d8 revert レシピ全開放 2022-06-07 12:24:16 +09:00
hirokei 80117fab62 調理演出調整 2022-06-07 12:06:33 +09:00
kimura f32bc324e1 演出開始トリガー修正 2022-06-07 11:21:50 +09:00
kimura c4e04e5956 デバッグに購入レシピ開放ボタン追加 2022-06-07 11:13:24 +09:00
hirokei f4eee0aefa 調理演出調整 2022-06-07 10:25:43 +09:00
hirokei ec979aa21d 調理演出調整 2022-06-07 09:58:57 +09:00
koya_15 56e55ad1d2 材料デザイン調整 2022-06-06 19:20:17 +09:00
koya_15 5bc9a0ffcc アニメーション調整 2022-06-06 18:52:42 +09:00
koya_15 f1f8610f23 材料演出調整 2022-06-06 17:53:16 +09:00
hirokei aa312d7fe5 汎用アニメ調整 2022-06-06 15:26:27 +09:00
hirokei a0ae05df40 いちご調整演出調整 2022-06-06 14:39:16 +09:00