Commit Graph

2575 Commits

Author SHA1 Message Date
xiaohui.wang 6ea91e6ea4 海外更新icon 2022-08-29 14:27:10 +08:00
xiaohui.wang 480e651cd1 跳转新规则 2022-08-19 18:07:36 +08:00
xiaohui.wang 86a8a4e4c0 补充isReadyBanner 2022-07-22 12:01:01 +08:00
xiaohui.wang 5593cccfd5 补充adjust上报 2022-07-14 15:03:04 +08:00
xiaohui.wang f6ef1d7241 开发者debugbug 2022-07-12 16:22:09 +08:00
xiaohui.wang f03f183260 防止未过新手引起卡死 2022-07-11 15:22:27 +08:00
xiaohui.wang 5f2bde6601 Merge commit '44776cafe9ebb62a791d6b058c31a12f3015cc6b' into release_joypac_os
# Conflicts:
#	popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab
#	popcorn/Assets/MyGame/Scripts/AdManager.cs
#	popcorn/Assets/MyGame/Scripts/FooterManager.cs
#	popcorn/Assets/Resources/I2Languages.asset
2022-07-08 18:08:23 +08:00
xiaohui.wang c2b21b85c5 gp宏 2022-07-07 20:32:16 +08:00
xiaohui.wang 6f218cb8fe 增加iOS banner 2022-07-06 19:06:08 +08:00
koya_15 44776cafe9 翻訳あてはめ 2022-07-06 12:52:33 +09:00
koya_15 69ea63c7c2 Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-06 12:45:41 +09:00
koya_15 4a041625ec 翻訳調整、弟レイヤー変更 2022-07-06 12:45:26 +09:00
kimura 76bffc60f8 add 翻訳 2022-07-06 12:42:53 +09:00
水谷圭吾 90e79554b5 Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame 2022-07-06 12:02:39 +09:00
水谷圭吾 d3678314f7 スプレッドシート更新 2022-07-06 12:02:29 +09:00
koya_15 d0f72123e8 翻訳あてはめ 2022-07-06 11:58:14 +09:00
koya_15 1f73398176 Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-06 11:03:07 +09:00
koya_15 c1348bd26a 翻訳画像あてはめ 2022-07-06 11:02:57 +09:00
水谷圭吾 77836e075c スプレッドシート更新 2022-07-06 10:49:02 +09:00
kimura 8baa58a7ec レシピ獲得通知修正 2022-07-06 10:24:00 +09:00
xiaohui.wang 07df8803bd gp参数 banner show click打点 2022-07-05 19:06:56 +08:00
koya_15 11e1683097 レイヤー調整 2022-07-05 20:02:47 +09:00
koya_15 cb46900bbe 背景レイヤー調整 2022-07-05 19:51:06 +09:00
koya_15 995c021317 Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 19:37:50 +09:00
koya_15 6de151eed3 背景調整 2022-07-05 19:37:42 +09:00
hirokei fac9437a9d Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 18:19:29 +09:00
hirokei 8b4a18e601 ステージのアイテム設置位置調整 2022-07-05 18:19:21 +09:00
koya_15 16bd396c1b Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 18:15:23 +09:00
koya_15 8a83c9e163 地面途中 2022-07-05 18:15:15 +09:00
koya_15 a0f751c901 地面画像ばらし 2022-07-05 18:14:40 +09:00
atusi 4e6518a01b Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 18:10:21 +09:00
atusi eba039f5fa Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 18:07:10 +09:00
atusi c495cf269a Merge branch 'feature/ver1.3_eng' into develop 2022-07-05 17:58:04 +09:00
すとう 03f33ccd88 マージ先 feature/ver1.3_eng (プルリクエスト #6)
Feature/ver1.3 eng
2022-07-05 08:56:24 +00:00
atusi 36639afe3e Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/ver1.3_eng 2022-07-05 17:52:01 +09:00
hirokei 53a463e8f2 デザイン調整 2022-07-05 17:43:49 +09:00
atusi 35b42cecb4 Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 17:43:44 +09:00
koya_15 94a6b1c3f5 Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-07-05 17:07:20 +09:00
koya_15 e76bf418b6 翻訳画像追加 2022-07-05 17:06:50 +09:00
水谷圭吾 186d444d25 Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame 2022-07-05 17:06:21 +09:00
水谷圭吾 2b82ccc316 ステージ調整 2022-07-05 17:05:58 +09:00
hirokei a8ff038db0 不要画像削除 2022-07-05 16:53:20 +09:00
xiaohui.wang bf206f083a 改用sdk上报finder 2022-07-05 14:43:56 +08:00
hirokei f778bbc0e6 空の雲調整 2022-07-05 14:38:10 +09:00
kimura e6e02da091 stage prefab削除 / デバッグエラー解消 2022-07-05 12:58:54 +09:00
kimura 2595c5421c カゴ表示切り替え調整 2022-07-05 12:11:36 +09:00
hirokei e706504871 上級空の色変更 2022-07-05 12:06:01 +09:00
水谷圭吾 3861f60d3a スプレッドシート更新 2022-07-05 10:22:04 +09:00
水谷圭吾 90a7472e48 Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame 2022-07-05 10:05:26 +09:00
水谷圭吾 14916013e8 ステージの唐辛子を2倍に変更 2022-07-05 10:05:10 +09:00