JieLing
|
e8d49378ab
|
Merge commit '3d3797345dbd0962cb626567d940064af3137877' into china/local
|
2021-07-16 14:09:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
328a382d4c
|
奖池预览页签修改提交
|
2021-07-16 11:55:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
0a4ef7e68d
|
心愿抽卡修改提交
|
2021-07-16 11:40:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
710b8b2f1b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-16 11:19:40 +08:00 |
DESKTOP-98AVA47\Administrator
|
60132143c7
|
新手引导修改提交
|
2021-07-16 11:19:36 +08:00 |
luyao
|
82e5b6fd5c
|
【点将台抽卡】召唤标题修改(猎妖师 变为 神将)
|
2021-07-16 11:05:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
04c9ab3b6b
|
抽卡修改提交
|
2021-07-16 10:30:56 +08:00 |
DESKTOP-98AVA47\Administrator
|
59de7adf87
|
去掉宝箱bilingbiling
|
2021-07-16 10:26:08 +08:00 |
DESKTOP-98AVA47\Administrator
|
c688666e99
|
向左滑动修改提交
|
2021-07-16 10:18:57 +08:00 |
DESKTOP-98AVA47\Administrator
|
89925e511a
|
抽卡调整
|
2021-07-16 10:15:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7187d75c4
|
预设调整,左右红点切换界面调整
|
2021-07-16 10:12:41 +08:00 |
JLIOSM1
|
7285c52be1
|
【IOS】新增打开网页的接口
|
2021-07-15 23:09:58 +08:00 |
JLIOSM1
|
8f272916c5
|
【资源加载】IOS资源加载增加前缀:file://
|
2021-07-15 23:09:33 +08:00 |
JLIOSM1
|
808efb6764
|
【延长登录界面的打开事件】
|
2021-07-15 23:08:41 +08:00 |
JLIOSM1
|
d2dd9401f4
|
【登录】提审服不再显示公告
|
2021-07-15 23:04:59 +08:00 |
JLIOSM1
|
3ca8ee5259
|
【引导】修复新手引导跳转界面导致界面无法销毁的问题
|
2021-07-15 23:04:07 +08:00 |
luyao
|
b8afca215b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 21:10:50 +08:00 |
luyao
|
2fbecd6584
|
文字修改提交
|
2021-07-15 21:10:37 +08:00 |
zhangqiang
|
06c8e6f4d8
|
【游心配置文件】
|
2021-07-15 21:03:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
af7e58f531
|
位置修改
|
2021-07-15 21:02:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
08b9873d25
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 20:48:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
53dadfff49
|
抽卡修改提交
|
2021-07-15 20:48:46 +08:00 |
wangzhenxing
|
908f15bf49
|
[乾坤宝盒]===========预设特效修改提交
|
2021-07-15 20:17:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b413e06e2
|
神将抽加号修改
|
2021-07-15 20:08:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
dda2c78b05
|
预设修改提交
|
2021-07-15 19:59:54 +08:00 |
ZhangBiao
|
d639f0ccd3
|
资源名重复
|
2021-07-15 19:57:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
fc1a2bca84
|
文字颜色修改提交
|
2021-07-15 19:53:08 +08:00 |
ZhangBiao
|
9cfca39bb1
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-15 19:48:59 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
385dcb9c90
|
位置修改交
|
2021-07-15 19:47:04 +08:00 |
ZhangBiao
|
88bd6a9801
|
【新副本】完成?
|
2021-07-15 19:46:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
3ee8153112
|
抽卡界面修改
|
2021-07-15 19:40:09 +08:00 |
DESKTOP-98AVA47\Administrator
|
6d4bf07c21
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:38:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
01a2171a31
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 19:33:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
18cc7ec6a4
|
红点报错修改提交
|
2021-07-15 19:20:20 +08:00 |
DESKTOP-98AVA47\Administrator
|
695a61abaa
|
Merge branch '0优化/主题活动' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
|
2021-07-15 18:52:59 +08:00 |
DESKTOP-98AVA47\Administrator
|
c5ceba8603
|
【ID1009654】
【优化】优化抽卡界面
|
2021-07-15 18:51:51 +08:00 |
DESKTOP-98AVA47\Administrator
|
798d4d9a4e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 18:23:27 +08:00 |
DESKTOP-98AVA47\Administrator
|
7eb776f699
|
【ID1009829】
升星界面的进阶要求改成进阶预览
|
2021-07-15 18:23:17 +08:00 |
wangzhenxing
|
4d428fd383
|
[战斗]==========被动292 ,319 修改
|
2021-07-15 18:20:38 +08:00 |
ZhangBiao
|
edaacd0e69
|
重复名资源提交
|
2021-07-15 17:24:56 +08:00 |
wangzhenxing
|
e2f4a55226
|
【乾坤宝盒】=============协议提交
|
2021-07-15 17:19:41 +08:00 |
wangzhenxing
|
fe8714f7fa
|
[乾坤宝盒]========优化提交
|
2021-07-15 16:43:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
27b0f524f9
|
协议提交
|
2021-07-15 16:40:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
55607708df
|
资源修改提交
|
2021-07-15 16:19:27 +08:00 |
ZhangBiao
|
109a109301
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/StreamingAssets/Android.meta
|
2021-07-15 16:19:05 +08:00 |
ZhangBiao
|
7d4c8b6c3f
|
【山河试炼】
|
2021-07-15 16:08:39 +08:00 |
ZhangBiao
|
7075049c45
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-15 15:58:58 +08:00 |