wangzhenxing
|
beb2acd3af
|
【战斗】=========buff图标大小修改提交
|
2021-12-29 15:20:11 +08:00 |
ZhangBiao
|
a1301a4a22
|
【家园】任务
|
2021-12-29 14:03:16 +08:00 |
wangzhenxing
|
33f1934d02
|
【战斗】========角色皮肤释放技能表现修改
|
2021-12-29 13:08:32 +08:00 |
gaoxin
|
d659eeba39
|
【动画】排行,邮件界面动画优化,部分简介界面动画关闭
|
2021-12-31 04:32:09 +08:00 |
gaoxin
|
07dec9a6d5
|
【每日签到】分帧加载
|
2021-12-31 03:01:26 +08:00 |
gaoxin
|
d16833005a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-31 01:45:20 +08:00 |
gaoxin
|
17394f79a0
|
【动画】神将切换动画优化
|
2021-12-31 01:45:13 +08:00 |
gaoxin
|
26dc765925
|
【动画】物品信息动画修改
|
2021-12-31 00:36:36 +08:00 |
gaoxin
|
52229c0d94
|
【邮件】内容显示自适应
|
2021-12-31 00:24:37 +08:00 |
gaoxin
|
0697e8646f
|
【动画】主城添加动画
|
2021-12-31 00:18:24 +08:00 |
gaoxin
|
52abb411a2
|
【动画】主城添加动画
|
2021-12-31 00:14:14 +08:00 |
gaoxin
|
b6a00666ae
|
【动画】循环列表动画修改为平移动画,拖动时不再播放动画
|
2021-12-30 22:09:34 +08:00 |
gaoxin
|
e5b2eb212b
|
【动画】日常任务动画优化
|
2021-12-30 22:08:45 +08:00 |
gaoxin
|
e90f96705d
|
【动画】通用弹窗动画优化
|
2021-12-30 22:08:29 +08:00 |
gaoxin
|
5757b82777
|
【动画】三级弹窗,帮助界面动画优化
|
2021-12-30 22:08:06 +08:00 |
ZhangBiao
|
197b28b3da
|
【家园】加速确认
|
2021-12-28 18:27:31 +08:00 |
ZhangBiao
|
d81a2b7265
|
【命格】界面无法打开修改
|
2021-12-28 15:01:43 +08:00 |
ZhangBiao
|
69cb591edb
|
【家园】升级进度条
|
2021-12-28 13:37:04 +08:00 |
ZhangBiao
|
b66cfdc61d
|
【家园】提交
|
2021-12-28 11:54:08 +08:00 |
wangzhenxing
|
d7749de932
|
【资源】======女儿国王 申公豹spine修改
|
2021-12-27 15:45:21 +08:00 |
wangzhenxing
|
07a90b7279
|
[战斗]=========战斗记录老虎上无敌盾记录修改
|
2021-12-27 15:42:38 +08:00 |
gaoxin
|
220bfff064
|
【优化】魂印描述优化
|
2021-12-30 00:54:40 +08:00 |
gaoxin
|
dc431e3f4d
|
【首充收缩框】需要每次登陆后展开,当前是打开主城时展开
|
2021-12-27 12:05:43 +08:00 |
gaoxin
|
89f8af19c4
|
【主城】竖条改为初始打开
|
2021-12-31 01:53:05 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
jiaoyangna
|
577752e71d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 16:31:41 +08:00 |
jiaoyangna
|
65dbdc5283
|
【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
|
2021-12-24 16:31:25 +08:00 |
wangzhenxing
|
d3253c5edb
|
【战斗】========技能释放逻辑修改,技能播放技能攻击动作
|
2021-12-24 16:11:53 +08:00 |
wangzhenxing
|
b07d5548e6
|
[功能]========坐骑界面选中状态修改
|
2021-12-24 15:45:04 +08:00 |
wangzhenxing
|
ca17383879
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-24 14:55:22 +08:00 |
jiaoyangna
|
2a9b8c706e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:52:23 +08:00 |
jiaoyangna
|
09a810af3f
|
玉帝跳转提交
|
2021-12-24 14:52:05 +08:00 |
ZhangBiao
|
a28021b4f6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:47:52 +08:00 |
ZhangBiao
|
80b6315905
|
【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取
|
2021-12-24 14:47:39 +08:00 |
jiaoyangna
|
b33bd02c7f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:25:22 +08:00 |
gaoxin
|
9965f8e079
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-30 23:29:11 +08:00 |
gaoxin
|
9c22dfc990
|
【提审】不再显示充值竖条,也不再触发相关引导
|
2021-12-30 23:28:55 +08:00 |
ZhangBiao
|
fea92ffabc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:20:06 +08:00 |
jiaoyangna
|
36ec134505
|
玉帝获取途径跳转提交
|
2021-12-24 14:20:06 +08:00 |
ZhangBiao
|
99d00e88e2
|
【命格】合成界面第一次打开道具详情
|
2021-12-24 14:19:47 +08:00 |
luyao
|
0a9fcbde7c
|
【天蚀虎】头像 敬请期待图
|
2021-12-24 14:16:19 +08:00 |
wangzhenxing
|
c7c6889e27
|
[资源]============虎年坐骑修改提交
|
2021-12-24 14:06:50 +08:00 |
wangzhenxing
|
6e2b1c1a17
|
[战斗]=======被动56 被动368修改
|
2021-12-24 14:00:51 +08:00 |
gaoxin
|
e901bd9d3b
|
【轩辕宝镜】通关到最后一层,打开界面时列表位置没有固定在最新关
|
2021-12-30 22:37:35 +08:00 |
gaoxin
|
d10d2f976a
|
【装备合成】添加输入改变合成数量的功能
|
2021-12-30 22:19:09 +08:00 |
gaoxin
|
613380a99f
|
【装备合成】添加长按自动增加数量功能
|
2021-12-30 20:32:11 +08:00 |
jiaoyangna
|
00dc90f4bb
|
商店报错添加容错
|
2021-12-24 11:05:39 +08:00 |
jiaoyangna
|
89b5eae8ec
|
商店添加容错
|
2021-12-24 10:58:55 +08:00 |
jiaoyangna
|
e34092f93d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 10:54:16 +08:00 |
gaoxin
|
8f0567d801
|
【挂机】新人商城按钮资源修改
|
2021-12-30 03:05:32 +08:00 |
jiaoyangna
|
b1c5113c39
|
商店报错添加容错
|
2021-12-24 10:53:26 +08:00 |
ZhangBiao
|
dbc3395945
|
【家园】详情
|
2021-12-24 09:33:56 +08:00 |
ZhangBiao
|
078c3a1f96
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 17:48:20 +08:00 |
skuld
|
606bedd85c
|
【挂机】新人商城按钮效果修改
|
2021-12-23 17:43:36 +08:00 |
skuld
|
9d2f9b70cb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-23 17:31:25 +08:00 |
skuld
|
bd746b40b0
|
bat Resource Commit:2021/12/23,17:27:24
|
2021-12-23 17:27:25 +08:00 |
ZhangBiao
|
d06fdbbac6
|
【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮
|
2021-12-23 17:19:27 +08:00 |
ZhangBiao
|
7f9726e006
|
【命格】提交
|
2021-12-23 16:39:37 +08:00 |
ZhangBiao
|
926e0a4fbd
|
【命石】一键合成修改
|
2021-12-23 16:17:35 +08:00 |
wangzhenxing
|
c895652ef1
|
[战斗]======被动412 修改
|
2021-12-23 15:18:44 +08:00 |
gaoxin
|
7ea4c7bc51
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-30 00:01:21 +08:00 |
gaoxin
|
da2b205955
|
【挂机】添加新人商城入口
|
2021-12-30 00:01:14 +08:00 |
ZhangBiao
|
c920c8d064
|
【家园】预设冲突提交
|
2021-12-23 14:53:14 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
wangzhenxing
|
3e640aef81
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-23 14:38:02 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
gaoxin
|
5eec5952ef
|
【协议】更新到最新
|
2021-12-23 14:37:31 +08:00 |
wangzhenxing
|
76d9e596b4
|
[战斗]======被动412 提交
|
2021-12-23 14:37:19 +08:00 |
jiaoyangna
|
39254af42e
|
探索提交
|
2021-12-23 13:45:05 +08:00 |
luyao
|
d62532c90c
|
【坐骑】资源名冲突修改
|
2021-12-23 11:46:13 +08:00 |
gaoxin
|
cf87db6577
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-23 11:05:25 +08:00 |
ZhangBiao
|
e6d1ac6ef0
|
【修行】冲突修改
|
2021-12-23 09:53:00 +08:00 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +08:00 |
gaoxin
|
b74274b75a
|
【引导】添加战斗失败触发类型38, 添加引导进入假战斗类型20
|
2021-12-22 18:25:36 +08:00 |
wangzhenxing
|
b7bfc1d867
|
【资源】======虎年坐骑提交
|
2021-12-22 16:15:51 +08:00 |
wangzhenxing
|
a7dac651c6
|
[资源]=======罗刹spine修改
|
2021-12-22 16:14:42 +08:00 |
gaoxin
|
be1ce2a189
|
【场景】添加开天新包配置
|
2021-12-22 15:15:02 +08:00 |
gaoxin
|
39495bee28
|
【至尊降世】修复老活动跳转报错
|
2021-12-21 21:03:42 +08:00 |
gaoxin
|
9a1350e8d3
|
【超值基金】语法错误
|
2021-12-21 18:27:15 +08:00 |
ZhangBiao
|
e111740975
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-21 18:13:13 +08:00 |
jiaoyangna
|
85795f19cc
|
适配修改提交
|
2021-12-21 18:12:15 +08:00 |
ZhangBiao
|
d2efbd920c
|
【家园】提交
|
2021-12-21 18:11:12 +08:00 |
jiaoyangna
|
99ca3a60eb
|
适配修改提交
|
2021-12-21 18:10:34 +08:00 |
jiaoyangna
|
e96d6e5744
|
适配修改
|
2021-12-21 17:37:19 +08:00 |
jiaoyangna
|
edbf25dc59
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 17:21:26 +08:00 |
jiaoyangna
|
89fdc69afd
|
添加拍脸提交
|
2021-12-21 17:21:10 +08:00 |
ZhangBiao
|
0a8bdbe4b6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:51:55 +08:00 |
ZhangBiao
|
53f7d29337
|
【商城界面】提交
|
2021-12-21 16:51:40 +08:00 |
gaoxin
|
3054bbfdeb
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:34 +08:00 |
gaoxin
|
86daa70b9c
|
【特权】添加充值金额解锁类型
|
2021-12-21 16:33:28 +08:00 |
ZhangBiao
|
51d281c1ee
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 16:33:19 +08:00 |
ZhangBiao
|
58ffbf416c
|
【商城界面】提示修改
|
2021-12-21 16:32:59 +08:00 |
gaoxin
|
605dd4e111
|
【战斗】跳过按钮解锁提示问题修改
|
2021-12-21 15:38:42 +08:00 |
gaoxin
|
dc8e1ac904
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 14:32:01 +08:00 |
gaoxin
|
0b5ca2a460
|
【引导】引导触发方式参数开放给功能引导使用,添加触发类型37 十连结果界面打开触发
|
2021-12-21 14:31:26 +08:00 |
ZhangBiao
|
462ac9c494
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 13:24:11 +08:00 |
ZhangBiao
|
b9bb2cf544
|
【修行】星数到达四位后只显示三位
|
2021-12-21 13:23:16 +08:00 |
jiaoyangna
|
e9a7188d7d
|
十连黑屏修改提交
|
2021-12-21 13:20:29 +08:00 |
jiaoyangna
|
f094d16e53
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-21 13:11:24 +08:00 |
jiaoyangna
|
f9689bafde
|
删除没用的log
|
2021-12-21 13:10:52 +08:00 |