PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
238 Commits
4 Branches
0 Tags
493 MiB
Commit Graph

238 Commits (96bc671c6ab4d93dbf0eb4969d2ded9519f109f7)

Author SHA1 Message Date
zhangaotian 96bc671c6a Merge branch 'main' into iOS_release 2024-08-23 17:18:48 +08:00
zhangaotian 535707e9cc 【Bug】删除无用资源、修改bug 2024-08-23 17:18:38 +08:00
zhangaotian db9eb019af Merge branch 'main' into iOS_release 2024-08-23 15:31:55 +08:00
zhangaotian 7c9fd6f6de 【iOS】Version: 1.0.4 Code: 11 2024-08-23 15:31:39 +08:00
zhangaotian 7a37ce77cc 【优化】增加失败看广告获得时间弹窗 2024-08-23 15:30:30 +08:00
zhangaotian 617f1d9cf7 【补提】 2024-08-23 15:20:17 +08:00
zhangaotian 3af2ec9047 【更新】更新制作者名字 2024-08-23 14:53:58 +08:00
zhangaotian 6f51f8417e Merge branch 'main' into iOS_release 2024-08-23 13:25:26 +08:00
zhangaotian 30cfae0338 【iOS】Version: 1.0.4 Code: 10 2024-08-23 13:25:15 +08:00
zhangaotian 6d84180241 【Bug】钉子移动时暂停游戏bug 2024-08-23 13:23:22 +08:00
zhangaotian 2e1cf4debb Merge branch 'main' into iOS_release 2024-08-23 11:35:33 +08:00
zhangaotian 89e0739f74 【Bug】修复增加时间后精灵特效消失 2024-08-23 11:34:55 +08:00
zhangaotian a2e6857ef8 Merge branch 'main' into iOS_release 2024-08-23 10:52:41 +08:00
zhangaotian 651870f891 【Bug】加载蓝图 2024-08-22 19:42:29 +08:00
zhangaotian 5c459447f5 【UI】制作者 2024-08-22 19:01:25 +08:00
zhangaotian 265131d083 【Bug】战斗中返回建造场景 2024-08-22 17:29:54 +08:00
zhangaotian 77c8a4bed9 【特效】商店飞金币 2024-08-22 16:38:42 +08:00
zhangaotian 2923def249 【存盘】默认打开没有解锁完成主题 2024-08-22 15:05:59 +08:00
zhangaotian 9a0fb7c3f8 【建造】主题选择功能 2024-08-22 14:03:37 +08:00
zhangaotian b056cc15fa 【优化】替换主题背景 2024-08-21 17:50:40 +08:00
zhangaotian 6ec1eb01c2 【优化】具体化解锁提示、解锁条件更改 2024-08-21 17:31:49 +08:00
zhangaotian 1067ca27bf 【Bug】撤回bug 2024-08-21 16:24:06 +08:00
zhangaotian d952f891d6 【Bug】蓝图没加载、金币显示错误 2024-08-21 14:34:05 +08:00
zhangaotian 48157247ca 【iOS】Version: 1.0.4 Code: 9 2024-08-20 16:53:36 +08:00
zhangaotian d3829c0456 Merge branch 'main' into iOS_release 2024-08-20 16:50:42 +08:00
zhangaotian 9840b222ed 【Bug】修改 2024-08-20 16:49:01 +08:00
zhangaotian c9a5a072a0 【Bug】资源加载 2024-08-20 14:37:30 +08:00
zhangaotian fb854093a5 【Bug】修改 2024-08-20 13:19:06 +08:00
zhangaotian f241d357bb Merge branch 'ios_main' 2024-08-19 17:27:28 +08:00
zhangaotian cd22bda050 【建造】完善 2024-08-19 17:25:46 +08:00
zhangaotian ad582c9051 【建造】更换存盘方式 2024-08-19 15:44:15 +08:00
zhangaotian 2598584a88 【Firebase】更新安卓配置文件 2024-08-16 13:54:11 +08:00
zhangaotian ee145dcd53 【PHXHSDK】切换分支删除TalkingData 2024-08-15 18:25:37 +08:00
zhangaotian b5f45b66e5 【建造】第二个场景 2024-08-15 17:56:54 +08:00
zhangaotian 3d9a913e75 Reapply "【资源】添加" 
This reverts commit 0649d4d4ca.
 2024-08-15 16:04:13 +08:00
zhangaotian 9b76dd7662 Reapply "【建造】更换素材" 
This reverts commit 4a4f01b214.
 2024-08-15 16:03:54 +08:00
zhangaotian d434bf99bf Reapply "【建造】新场景资源、修改建造编辑器及相关逻辑" 
This reverts commit 2aecb71617.

# Conflicts:
#	Forest/Assets/Scripts/Framework/Game/GameStartLoadingExecutor.cs
#	Forest/Assets/Scripts/Gameplay2/BuildManager.cs
 2024-08-15 16:03:41 +08:00
zhangaotian b42a4a2a02 【Bug】 2024-08-15 12:52:27 +08:00
zhangaotian 98495d6a7e 【Bug】新手引导 2024-08-15 12:43:09 +08:00
zhangaotian fd52c816fb 【Bug】新手引导 2024-08-15 12:18:14 +08:00
zhangaotian 1ffc102479 Revert "【商店】关闭购买" 
This reverts commit 6cd54c950c.
 2024-08-15 12:04:43 +08:00
zhangaotian d0627343ad Revert "【商品】" 
This reverts commit ce908d7b12.
 2024-08-15 12:04:17 +08:00
zhangaotian ce908d7b12 【商品】 2024-08-14 14:42:35 +08:00
zhangaotian 4ea70a5a21 Revert "【Shop】关闭IAP、商店初始化" 
This reverts commit e0adc8f70c.
 2024-08-14 14:40:34 +08:00
zhangaotian e0adc8f70c 【Shop】关闭IAP、商店初始化 2024-08-14 14:28:06 +08:00
zhangaotian 6cd54c950c 【商店】关闭购买 2024-08-14 14:19:13 +08:00
zhangaotian 2aa784d4e7 【资源】金币不足 2024-08-14 14:18:52 +08:00
zhangaotian a6facbe5ee 【商品】安卓 2024-08-14 12:56:04 +08:00
zhangaotian 4829a07f94 【商店】更新商店 2024-08-14 12:31:54 +08:00
zhangaotian 57ce6b6c20 【内购】 2024-08-13 16:52:23 +08:00