ZhangBiao
|
165ad7a2de
|
【修行】提交
|
2021-05-22 18:20:07 +08:00 |
zhangqiang
|
cb86e3efd4
|
【山河社稷图】
|
2021-05-21 19:07:46 +08:00 |
wangzhenxing
|
d95768226b
|
红包红点显示修改
|
2021-05-21 18:18:53 +08:00 |
wangzhenxing
|
9b336aeda9
|
主城报错修改提交
|
2021-05-21 18:13:21 +08:00 |
wangzhenxing
|
cade21c700
|
主城报错修改提交
|
2021-05-21 18:00:25 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +08:00 |
zhangqiang
|
016667ef7e
|
【战斗背景音乐】 山河社稷图入口文字
|
2021-05-21 16:38:20 +08:00 |
zhangqiang
|
d2a53631d6
|
【山河社稷图】提交
|
2021-05-21 16:21:07 +08:00 |
gaoxin
|
24e02b07c6
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-21 15:31:48 +08:00 |
gaoxin
|
f6067f4402
|
【战斗】跳过优化
|
2021-05-21 15:31:40 +08:00 |
zhangqiang
|
4aaa6b29de
|
【山河社稷图】入口 + 特权修改
|
2021-05-21 15:29:14 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
zhangqiang
|
1ed6cbaad0
|
【山河社稷图】替换新资源
|
2021-05-21 14:37:09 +08:00 |
gaoxin
|
f15fbf6576
|
【探宝】物品置灰后不再显示光效
|
2021-05-21 14:14:09 +08:00 |
gaoxin
|
5f77a01928
|
【meta】
|
2021-05-21 13:56:58 +08:00 |
gaoxin
|
3f59300826
|
【挂机】修复vip任务刷新不及时的问题
|
2021-05-21 13:55:40 +08:00 |
gaoxin
|
006eae4bd9
|
【死灵试炼】资源及相关代码导入,但代码未使用
|
2021-05-21 13:45:10 +08:00 |
gaoxin
|
a8c8d08775
|
【挂机】优化挂机界面vip任务显示
|
2021-05-21 11:57:59 +08:00 |
gaoxin
|
d89511a3d9
|
【跳转】资源条添加碎繁星辰跳转
|
2021-05-21 11:02:24 +08:00 |
gaoxin
|
e72d1ee9c0
|
【挂机】优化跳转
|
2021-05-21 11:01:37 +08:00 |
gaoxin
|
aecc6eb692
|
【特权优化】特权任务在关卡界面增加快捷入口
|
2021-05-20 21:00:29 +08:00 |
zhangqiang
|
da17fb96ed
|
【主城修改】2
|
2021-05-20 20:32:04 +08:00 |
zhangqiang
|
2d4ecc8c04
|
Merge branch 'china/dev-c' into china/mainSceneChange
|
2021-05-20 20:29:41 +08:00 |
ZhangBiao
|
abcc89c68f
|
【修行】选择神将从generalpopup到bigpopup
|
2021-05-20 20:23:22 +08:00 |
ZhangBiao
|
7f19809419
|
【修行】提交
|
2021-05-20 20:12:01 +08:00 |
ZhangBiao
|
e51378ab3b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 18:00:53 +08:00 |
ZhangBiao
|
46cc1d9591
|
【修行】限制特权入口,增加仙尘加号
|
2021-05-20 18:00:45 +08:00 |
zhangqiang
|
02b3f94761
|
【首领关卡】不允许跳过提示修改
|
2021-05-20 17:50:44 +08:00 |
ZhangBiao
|
b22b8abd6a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 17:38:07 +08:00 |
ZhangBiao
|
b1e7cd1164
|
【修行】提交
|
2021-05-20 17:37:56 +08:00 |
zhangqiang
|
97ba718ac2
|
Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-05-20 17:32:06 +08:00 |
gaoxin
|
243240d803
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:51:34 +08:00 |
gaoxin
|
239f8c50e4
|
【社稷大典】奖励提示添加
|
2021-05-20 16:51:09 +08:00 |
zhangqiang
|
4b2259d65a
|
【山河社稷图】加副关卡编队
|
2021-05-20 16:46:26 +08:00 |
gaoxin
|
6f0132e18d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 16:12:20 +08:00 |
gaoxin
|
bd27d190ac
|
【屏幕适配】部分界面优化
|
2021-05-20 16:12:15 +08:00 |
zhangqiang
|
fc1dc60119
|
【特权加等级奖励】4
|
2021-05-20 16:11:18 +08:00 |
zhangqiang
|
90bba41910
|
【特权加等级奖励】3
|
2021-05-20 15:47:15 +08:00 |
gaoxin
|
16596f733d
|
【竞技场】免费次数提示添加
|
2021-05-20 14:59:40 +08:00 |
gaoxin
|
3007dafa27
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 14:37:05 +08:00 |
gaoxin
|
0bc7a1d3e8
|
【资源】修复新增spine动画的动作问题
|
2021-05-20 14:36:40 +08:00 |
zhangqiang
|
ede26383c8
|
【特权加等级奖励】2
|
2021-05-20 14:19:29 +08:00 |
zhangqiang
|
80183cd5a0
|
【特权加等级奖励】1
|
2021-05-20 14:18:48 +08:00 |
ZhangBiao
|
ae10b715cd
|
【修行】神印界面提交
|
2021-05-20 11:57:27 +08:00 |
ZhangBiao
|
40cafcca32
|
【修行】神印界面结构修改
|
2021-05-20 11:18:42 +08:00 |
ZhangBiao
|
e416d30107
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-20 10:55:48 +08:00 |
ZhangBiao
|
5ea5e5b689
|
【修行】紫府神印界面添加资源
|
2021-05-20 10:55:33 +08:00 |
gaoxin
|
f67e673401
|
【资源】立绘提交
|
2021-05-20 10:19:09 +08:00 |
ZhangBiao
|
3f7e243b70
|
【修行】this.spLoader提交
|
2021-05-20 09:48:52 +08:00 |