yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,265 Commits 1 Branch 0 Tags 1.1 GiB
Commit Graph

2265 Commits

Author SHA1 Message Date
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
xiaohui.wang 07df8803bd gp参数 banner show click打点 2022-07-05 19:06:56 +08:00
xiaohui.wang bf206f083a 改用sdk上报finder 2022-07-05 14:43:56 +08:00
闫婷婷 6bde57b019 setting 2022-07-04 18:19:34 +08:00
闫婷婷 83feeb7a1d fix adjust finder bug 2022-06-27 15:43:57 +08:00
闫婷婷 c168fddfa1 - 2022-06-21 15:36:57 +08:00
闫婷婷 c3abe47d90 更改为float类型，double不支持 2022-06-21 15:34:56 +08:00
闫婷婷 d9b667d28e 翻译遗漏 2022-06-21 14:50:14 +08:00
闫婷婷 4bda25b3b8 大小写玄学 2022-06-21 11:07:54 +08:00
闫婷婷 c11c10b34f - 2022-06-21 11:07:30 +08:00
闫婷婷 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