Commit Graph

3100 Commits

Author SHA1 Message Date
koya_15 f68a0031dd ミニゲーム未解放時POP追加 2022-06-21 16:38:33 +09: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
kimura aaefe0ce02 add stage test 2022-06-21 15:14:21 +09:00
kimura 89df731e01 add point 15 2022-06-21 15:03:09 +09:00
kimura a51093553f fix debug 2022-06-21 14:57:12 +09:00
koya_15 996af05dd6 ミニゲームボタンのアニメーションループ切る 2022-06-21 14:55:32 +09:00
koya_15 1b0ab7b687 Merge branch 'feature/addMiniGame' of bitbucket.org:usaya/popcorn into feature/addMiniGame 2022-06-21 14:52:09 +09:00
koya_15 0b02b934e6 フッターにミニゲームボタン追加 2022-06-21 14:52:00 +09:00
kimura 786465ef76 障害物アクション仮追加/デバッグ機能追加 2022-06-21 14:43:40 +09:00
kimura 564cad3c86 add result 2022-06-21 14:43:40 +09:00
kimura 89bfe98352 add stagemanager 2022-06-21 14:43:40 +09:00
kimura 03e5780b1f add prefab 2022-06-21 14:43:40 +09:00
koya_15 a89a4c7781 ミニゲームUI設置途中 2022-06-21 14:33:41 +09:00
koya_15 192bc7f124 ミニゲーム素材追加 2022-06-21 14:20:41 +09: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
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