闫婷婷
|
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 |
|
koya_15
|
d5096913ac
|
ローカライズあてはめ
|
2022-05-23 17:26:36 +09:00 |
|
koya_15
|
e93d6a6236
|
ローカライズ画像あてはめ
|
2022-05-23 16:49:10 +09:00 |
|
koya_15
|
e2e33f5599
|
完了素材名前変更
|
2022-05-23 16:21:50 +09:00 |
kimura
|
a9dacd823d
|
Merge branch 'feature/1.3.0' into feature/lang_ver1.3
# Conflicts:
# popcorn/Assets/MyGame/Scenes/marketing/Customize.unity
|
2022-05-23 16:14:51 +09:00 |
|
kimura
|
5c0e227215
|
localize対応 key追加
|
2022-05-23 16:14:22 +09:00 |
|
koya_15
|
964e56b5af
|
ローカライズあてはめ途中
|
2022-05-23 16:06:13 +09:00 |
|
koya_15
|
b98a04f47a
|
追加中国語素材移動
|
2022-05-23 15:43:04 +09:00 |
|
atusi
|
7cfd686f53
|
deleted Material/UI
|
2022-05-23 15:37:03 +09:00 |
|
atusi
|
22479ace80
|
Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into feature/lang_korea
|
2022-05-23 15:15:34 +09:00 |
|
atusi
|
5beefca79d
|
Merge branch 'develop' of bitbucket.org:usaya/popcorn into feature/lang_korea
|
2022-05-23 15:11:45 +09:00 |
|
xiaohui.wang
|
56dc65df90
|
jpsdk修复不联网崩溃
|
2022-05-23 13:37:25 +08:00 |
|
koya_15
|
d2347100dd
|
カスタマイズ画像ローカライズあてはめ
|
2022-05-23 14:37:02 +09:00 |
|
koya_15
|
dc26de5ba0
|
ローカライズ画像あてはめ
|
2022-05-23 14:09:18 +09:00 |
|
kimura
|
2acecfdb5d
|
Localize対応
|
2022-05-23 13:49:09 +09:00 |
|
koya_15
|
0d483b7d76
|
ローカライズ画像あてはめ途中
|
2022-05-23 12:16:30 +09:00 |
|
koya_15
|
7bde93d29b
|
中国語素材追加
|
2022-05-23 11:40:51 +09:00 |
|
xiaohui.wang
|
8b1aed29ac
|
热云sdk修改
|
2022-05-23 10:15:16 +08:00 |
|
xiaohui.wang
|
f31a89bfc5
|
iOS接入热云
|
2022-05-23 10:07:03 +08:00 |
|
すとう
|
d0fb07a28b
|
マージ先 feature/1.3.0 (プルリクエスト #2)
Feature/1.3.0
|
2022-05-20 10:11:04 +00:00 |
|
koya_15
|
1453b5a183
|
カスタマイズ画面虹の羽枠調整
|
2022-05-20 18:55:27 +09:00 |
|
kimura
|
b52662e341
|
localize対応
|
2022-05-20 18:16:29 +09:00 |
|
kimura
|
49dd03d694
|
localize対応
|
2022-05-20 18:11:57 +09:00 |
|
koya_15
|
3efa69130a
|
アイコンプレハブ修正
|
2022-05-20 18:05:35 +09:00 |