jiaoyangna
|
b65e6c7bac
|
神将来源修改提交
|
2021-06-30 14:21:02 +08:00 |
jiaoyangna
|
6e0eccfde5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 14:11:00 +08:00 |
jiaoyangna
|
a556ee7e2d
|
关闭界面时 称号预设未关闭 错误 问题修改
|
2021-06-30 14:10:30 +08:00 |
ZhangBiao
|
4507a0d139
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 13:51:56 +08:00 |
ZhangBiao
|
00ad684deb
|
【心愿抽卡】QA
|
2021-06-30 13:51:47 +08:00 |
gaoxin
|
de8479ba3d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-30 13:46:34 +08:00 |
gaoxin
|
fdba4e7aa3
|
【充值】添加第四个透传参数 平台(ANDROID或IOS)
|
2021-06-30 13:46:28 +08:00 |
ZhangBiao
|
04d4f6a5c3
|
【特惠神装】开坑
|
2021-06-30 13:26:34 +08:00 |
ZhangBiao
|
55bdc21a99
|
【心愿抽卡】增加初始化操作
|
2021-06-30 12:01:39 +08:00 |
ZhangBiao
|
782b20fa0c
|
【心愿抽卡】初始化抽卡总次数
|
2021-06-30 11:56:23 +08:00 |
jiaoyangna
|
ed1cf199a2
|
神将来源修改
|
2021-06-30 11:50:11 +08:00 |
jiaoyangna
|
58994f5a38
|
神将来源修改
|
2021-06-30 11:42:22 +08:00 |
jiaoyangna
|
6429cba1d4
|
代码报错修改
|
2021-06-30 11:37:33 +08:00 |
jiaoyangna
|
de0b9be884
|
添加首充和至尊降世的 显示
|
2021-06-30 11:36:07 +08:00 |
ZhangBiao
|
194c610b14
|
Merge branch 'china/dev' into 0功能/心愿抽卡
|
2021-06-30 11:00:00 +08:00 |
ZhangBiao
|
83fd6716e4
|
【心愿抽卡】增加长按查看操作
|
2021-06-30 10:58:35 +08:00 |
ZhangBiao
|
7d366000be
|
【心愿抽卡】完成
|
2021-06-30 10:52:05 +08:00 |
jiaoyangna
|
de642a3572
|
去掉点击事件
|
2021-06-30 10:48:50 +08:00 |
wangzhenxing
|
aeed1703bd
|
【ID1009572】【战斗】===========各种效果提示文字改为图片字 第二期提交
|
2021-06-30 10:40:52 +08:00 |
ZhangBiao
|
37e854190b
|
【心愿抽卡】增加所有抽卡类型和输出
|
2021-06-30 10:36:48 +08:00 |
ZhangBiao
|
ecb43803f4
|
【心愿抽卡】提交
|
2021-06-30 10:23:57 +08:00 |
jiaoyangna
|
f834e2e17d
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-30 10:12:44 +08:00 |
JieLing
|
af5fa192b6
|
【提审切换】使用正式的参数配置
|
2021-06-30 09:53:32 +08:00 |
JieLing
|
068bf059a5
|
【用户协议】添加功能开启配置
|
2021-06-30 09:52:40 +08:00 |
JieLing
|
9a3c8508c4
|
Merge branch '0功能/用户协议' into china/quick
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-06-30 09:35:51 +08:00 |
gaoxin
|
9f69b1ba8f
|
【登录】容错处理添加
|
2021-06-30 09:20:33 +08:00 |
gaoxin
|
a7c947d8b4
|
【登录】serverversion改为从后端获取
|
2021-06-30 09:18:03 +08:00 |
JieLing
|
aae1e82a1c
|
【登录】获取服务器列表和登录时的Channel差异化处理,分开配置,用于区分相同服务器列表的不同包
|
2021-06-30 09:16:28 +08:00 |
ZhangBiao
|
fc5a91522a
|
【心愿抽卡】提交
|
2021-06-29 20:29:22 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
ZhangBiao
|
262b52c4aa
|
【心愿抽卡】代码基本完成
|
2021-06-29 18:10:15 +08:00 |
ZhangBiao
|
cc16057438
|
【心愿抽卡】接协议
|
2021-06-29 15:25:05 +08:00 |
ZhangBiao
|
69581dcaa1
|
【心愿抽卡】开坑
|
2021-06-29 11:30:26 +08:00 |
JieLing
|
d492b01b5f
|
Merge remote-tracking branch 'origin/china/test' into china/zf_test
# Conflicts:
# Assets/Editor/AutoPack.cs
|
2021-06-29 10:12:13 +08:00 |
JieLing
|
840b6beb6f
|
Merge branch 'china/local' into china/test
|
2021-06-28 19:53:43 +08:00 |
jiaoyangna
|
73eac4d9e5
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05 )
|
2021-06-28 19:50:44 +08:00 |
zhangqiang
|
85d9610f41
|
【神将升级】升级到等级上限没有给后端发协议
|
2021-06-28 19:37:43 +08:00 |
jiaoyangna
|
3c41e96caa
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
(cherry picked from commit 1ec5cc7b05 )
|
2021-06-28 18:36:01 +08:00 |
jiaoyangna
|
1ec5cc7b05
|
【ID1016874】
【适配】限时召唤、灵兽宝阁、乾坤宝盒全面屏适配问题
|
2021-06-28 18:34:19 +08:00 |
ZhangBiao
|
64d1f4883e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-06-28 16:56:56 +08:00 |
ZhangBiao
|
24469e4666
|
【灵兽山】特效修改
|
2021-06-28 16:56:26 +08:00 |
gaoxin
|
1f8709f17e
|
【配置】猕猴桃硬核专服母包配置错误
|
2021-06-28 15:54:24 +08:00 |
zhangqiang
|
35508a2c8d
|
【太初行渠道quick】场景提交
|
2021-06-28 15:54:17 +08:00 |
gaoxin
|
c94eba491a
|
【配置】猕猴桃硬核专服母包配置错误
|
2021-06-28 15:53:49 +08:00 |
zhangqiang
|
1c4e8b184d
|
【猕猴桃专服quick配置文件】
|
2021-06-28 15:31:09 +08:00 |
gaoxin
|
2b4c7bb31e
|
【配置】新增硬核渠道配置
|
2021-06-28 14:22:15 +08:00 |
gaoxin
|
84cfa3e2c9
|
【配置】添加硬核渠道,先遣打包配置,热更删除默认密码
|
2021-06-28 14:22:04 +08:00 |
gaoxin
|
3b6c4c279f
|
【打包】quick打包场景提交
|
2021-06-28 14:21:55 +08:00 |
gaoxin
|
318323e50d
|
【配置】新增硬核渠道配置
|
2021-06-28 14:12:13 +08:00 |
JieLing
|
863dabcd1e
|
Merge branch 'china/local' into china/test
|
2021-06-28 13:35:29 +08:00 |