 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 |
|
zhangaotian
|
a2d1b18698
|
【内购】安卓商品
|
2024-08-13 16:20:17 +08:00 |
|
zhangaotian
|
a8c0053a69
|
Revert "【key】"
This reverts commit 848d8f74e5.
|
2024-08-13 15:50:55 +08:00 |
|
zhangaotian
|
c75e5f7d79
|
【安卓】关闭debuggable
|
2024-08-13 14:06:43 +08:00 |
马远征
|
4240accc9b
|
Merge branch 'main' into Android_release
|
2024-08-13 13:38:01 +08:00 |
|
马远征
|
848d8f74e5
|
【key】
|
2024-08-13 13:37:33 +08:00 |
|
zhangaotian
|
74f52d1928
|
Merge branch 'main' into Android_release
|
2024-08-13 12:46:58 +08:00 |
|
马远征
|
18bd56a215
|
【keystore】更换为旧的Key
|
2024-08-13 12:46:15 +08:00 |
|
zhangaotian
|
8fb5c58872
|
Merge branch 'main' into Android_release
|
2024-08-13 12:13:05 +08:00 |
|
马远征
|
73e268890e
|
【key】新key
|
2024-08-12 19:59:57 +08:00 |
|
马远征
|
bd5e47da58
|
【key】
|
2024-08-12 19:27:54 +08:00 |
|
zhangaotian
|
81ae484698
|
【key】提交
|
2024-08-12 19:17:49 +08:00 |
|
zhangaotian
|
6963988b7d
|
【Android】Version: 1.0.3 Code: 5
|
2024-08-12 17:10:31 +08:00 |
|
zhangaotian
|
a474da6e3b
|
【Android】Version: 1.0.3 Code: 5
|
2024-08-12 17:09:32 +08:00 |
|
zhangaotian
|
ff242ae980
|
【安卓】添加vending.BILLING
|
2024-08-12 15:44:43 +08:00 |
|
zhangaotian
|
9e4d56a0c6
|
【相机】删除多余脚本
|
2024-08-12 15:32:02 +08:00 |
|
zhangaotian
|
4561233718
|
【调整】更改代码结构
|
2024-08-12 14:43:10 +08:00 |
|
zhangaotian
|
ddb7759b46
|
【安卓】添加com.google.android.gms.permission.AD_ID
|
2024-08-12 13:20:42 +08:00 |
|
zhangaotian
|
6bb324115a
|
【info.plist】更新SkAdNetwork ID
|
2024-08-09 11:57:02 +08:00 |
|
zhangaotian
|
d5d2d5fc2c
|
【设置】评分存盘放入设置中
|
2024-08-08 20:00:10 +08:00 |
|
zhangaotian
|
b4833ef177
|
【调整】代码结构调整、归纳登录功能
|
2024-08-08 19:16:02 +08:00 |
|
zhangaotian
|
cb5bbe82ba
|
【设置】分离设置需求
|
2024-08-08 14:17:03 +08:00 |
|
zhangaotian
|
76af4a7d66
|
【重构】部分关卡代码
|
2024-08-07 18:51:02 +08:00 |
|
zhangaotian
|
f5ca0a09a7
|
【重构】修改部分代码结构
|
2024-08-07 15:22:09 +08:00 |
|
zhangaotian
|
b6cc31125d
|
【登录】安卓关闭登录功能
|
2024-08-05 18:54:55 +08:00 |