Commit Graph

2254 Commits

Author SHA1 Message Date
闫婷婷 334e805e3a 名字 bundle id 2022-06-21 11:03:55 +08:00
闫婷婷 c52810fb9b 推送翻译 2022-06-21 11:03:42 +08:00
闫婷婷 7b275fea70 去掉海外finder重复内容 2022-06-21 11:03:23 +08:00
闫婷婷 31d8777cc6 bundle 2022-06-21 11:03:03 +08:00
闫婷婷 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
闫婷婷 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
闫婷婷 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
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
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
atusi 36cce39460 update english text 2022-05-31 15:29:00 +09:00
atusi 71ad3da9a6 I2 - english項目追加 2022-05-31 15:18:20 +09:00
xiaohui.wang 6419d8ba1d 去除unity退出 2022-05-31 13:39:12 +08:00
xiaohui.wang cc2a6524f8 隐私按钮安卓写法 2022-05-27 22:42:05 +08:00
xiaohui.wang 1ed73ed62a 隐私协议 2022-05-27 19:48:01 +08:00
xiaohui.wang 088684d787 修改显示bug 2022-05-27 17:42:50 +08:00
xiaohui.wang a9b15c4da0 修正翻译 2022-05-25 18:44:55 +08:00
atusi 146e2c7e2a シート修正 2022-05-25 18:44:16 +09:00
atusi e3b550ac85 Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop 2022-05-25 17:40:39 +09:00
すとう cc4cf3bbe5 マージ先 feature/lang_ver1.3 (プルリクエスト #4)
Feature/lang ver1.3
2022-05-25 08:28:34 +00:00
atusi d6e958de3b Merge branch 'feature/lang_ver1.3' of bitbucket.org:usaya/popcorn into feature/lang_ver1.3 2022-05-25 17:28:14 +09:00
atusi a92740a6f6 icon パス修正 2022-05-25 17:22:19 +09:00
xiaohui.wang b37de1a726 Merge branch 'feature/lang_ver1.3' into release_joypac
# Conflicts:
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/addVideo.png
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/addVideo.png.meta
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/offdown.png
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/offdown.png.meta
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/shoppingSale.png
#	popcorn/Assets/MyGame/Resources/Material_zh/Main/Movie/shoppingSale.png.meta
#	popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity
#	popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
#	popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
#	popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab
#	popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
#	popcorn/Assets/MyGame/Scripts/Const.cs
2022-05-25 15:28:17 +08:00
xiaohui.wang 7d9740395f 5933 2022-05-25 10:55:09 +08:00
xiaohui.wang e0e3837cf0 5933 2022-05-25 10:51:19 +08:00
xiaohui.wang 994ee8acaf 5933 2022-05-25 10:49:36 +08:00
koya_15 45484c04a8 ローカライズあてはめ 2022-05-24 15:36:59 +09:00
koya_15 0a1f568f6f 韓国語素材追加 2022-05-24 15:08:42 +09:00
atusi b6910a9974 Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into develop 2022-05-24 11:43:30 +09:00
atusi b3c0f257fa スプレッドシート:Default更新 2022-05-23 18:17:27 +09:00