jiaoyangna
|
15361c2ef5
|
大圣跳转
|
2021-06-19 17:07:17 +08:00 |
wangzhenxing
|
5184ced8c8
|
[战斗]==============免疫buff清除提示修改
|
2021-06-19 16:41:00 +08:00 |
jiaoyangna
|
8342399870
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:50:56 +08:00 |
jiaoyangna
|
46621252d9
|
惊喜礼包拍脸修改
|
2021-06-19 15:50:39 +08:00 |
gaoxin
|
d11833e088
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:46:05 +08:00 |
gaoxin
|
04c89ccaa9
|
【月卡】月卡激活提示修改到关闭奖励界面之后
|
2021-06-19 15:45:13 +08:00 |
jiaoyangna
|
b6b55590b3
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:29:41 +08:00 |
jiaoyangna
|
67e5cbf8c9
|
大圣 不能查看详情修改
|
2021-06-19 15:29:31 +08:00 |
gaoxin
|
6d4d1fc49b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-19 15:28:27 +08:00 |
gaoxin
|
b423005b6e
|
【活动】页签使用原图大小
|
2021-06-19 15:28:22 +08:00 |
jiaoyangna
|
2e693575a6
|
抽卡提示只在神将抽里出现
|
2021-06-19 15:00:37 +08:00 |
jiaoyangna
|
bf1e1f69e6
|
添加以领取标志
|
2021-06-18 19:13:51 +08:00 |
jiaoyangna
|
89facf0425
|
添加红点检测
|
2021-06-18 19:04:44 +08:00 |
jiaoyangna
|
883fdceb78
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-18 19:00:51 +08:00 |
jiaoyangna
|
e267c0096b
|
预设提交
|
2021-06-18 18:56:46 +08:00 |
jiaoyangna
|
45a1079d88
|
大圣提交
|
2021-06-18 18:55:04 +08:00 |
ZhangBiao
|
9e5819433e
|
【新将来袭】
|
2021-06-18 18:45:56 +08:00 |
ZhangBiao
|
a957834228
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:38:29 +08:00 |
ZhangBiao
|
70a90b0148
|
【新将来袭】在线刷新修改
|
2021-06-18 18:38:17 +08:00 |
gaoxin
|
e0a3b3837c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 18:31:26 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
gaoxin
|
f85dc798d3
|
【公告】公告id添加对不同渠道的处理
|
2021-06-18 18:25:51 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
ZhangBiao
|
ddfe59a1d0
|
【升星有礼】
|
2021-06-18 18:17:36 +08:00 |
ZhangBiao
|
a05df3c77e
|
【升星有理】
|
2021-06-18 18:10:58 +08:00 |
ZhangBiao
|
78d2efc59c
|
【惊喜礼盒】提交
|
2021-06-18 18:01:27 +08:00 |
ZhangBiao
|
683964cd8a
|
【惊喜礼盒】资源更换
|
2021-06-18 17:52:09 +08:00 |
ZhangBiao
|
165a724ba3
|
【升星有理】
|
2021-06-18 17:29:00 +08:00 |
ZhangBiao
|
15172dab87
|
【升星有礼】
|
2021-06-18 17:17:52 +08:00 |
ZhangBiao
|
3744d8b901
|
【降妖夺宝】剩余时间限时修改
|
2021-06-18 17:06:20 +08:00 |
ZhangBiao
|
33866686ba
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-18 17:01:12 +08:00 |
ZhangBiao
|
a277f4578c
|
【升星有礼】重构提交
|
2021-06-18 17:00:52 +08:00 |
gaoxin
|
7fe73cca9e
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-18 16:04:33 +08:00 |
gaoxin
|
e88dcb7863
|
【热更】脚本优化,添加自动打tag的功能
|
2021-06-18 16:03:27 +08:00 |
jiaoyangna
|
12e0a2d0bb
|
拍脸修改提交
|
2021-06-18 15:53:42 +08:00 |
gaoxin
|
11934333fc
|
【技能】金吒技能特效新增
|
2021-06-18 15:29:07 +08:00 |
jiaoyangna
|
993bba8e0a
|
拍脸修改提交
(cherry picked from commit 8012c5691a )
|
2021-06-18 15:17:35 +08:00 |
jiaoyangna
|
8012c5691a
|
拍脸修改提交
|
2021-06-18 15:17:10 +08:00 |
ZhangBiao
|
a60e8a4329
|
【惊喜礼盒】底部回弹位置低
|
2021-06-18 15:06:53 +08:00 |
jiaoyangna
|
e593381b77
|
降妖夺宝修改提交
(cherry picked from commit 106647a69c )
|
2021-06-18 14:48:23 +08:00 |
jiaoyangna
|
106647a69c
|
降妖夺宝修改提交
|
2021-06-18 14:47:39 +08:00 |
ZhangBiao
|
6e617123b7
|
【新将来袭降妖夺宝】
|
2021-06-18 14:47:13 +08:00 |
gaoxin
|
21875c589f
|
【称号】称号特效显示兼容处理
|
2021-06-18 11:31:49 +08:00 |
gaoxin
|
74c5cd04c4
|
【配置】开启高帧率
|
2021-06-18 11:17:11 +08:00 |
jiaoyangna
|
09095e5b16
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
|
2021-06-18 11:08:40 +08:00 |
jiaoyangna
|
8b55bf1dc1
|
隐藏不显示的预设
|
2021-06-18 11:03:51 +08:00 |
jiaoyangna
|
65c09118ed
|
拍脸修改提交
|
2021-06-18 10:59:35 +08:00 |
jiaoyangna
|
c07ddcc6a8
|
拍脸修改提交
(cherry picked from commit 4635361d8b )
|
2021-06-18 10:50:21 +08:00 |
jiaoyangna
|
10c86e509a
|
超凡入圣修改提交
|
2021-06-18 10:50:04 +08:00 |
jiaoyangna
|
4635361d8b
|
拍脸修改提交
|
2021-06-18 10:48:49 +08:00 |