wangzhenxing
|
cda352d46e
|
【战斗】==========选择对位目标逻辑修改
|
2021-03-30 17:17:10 +08:00 |
ZhangBiao
|
d3d363762b
|
【福星高照】完成
|
2021-03-30 16:55:45 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
wangzhenxing
|
2e886d4524
|
【战斗】====清除盾效果添加破盾提示文字,清除免疫,持续伤害,控制效果添加清除提示;被动278修改;被动添加排序;控制效果结束修改
|
2021-03-30 16:34:17 +08:00 |
ZhangBiao
|
ee778776a1
|
【福星高照】提交
|
2021-03-30 16:24:28 +08:00 |
jiaoyangna
|
a0552233ae
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-03-30 16:15:49 +08:00 |
jiaoyangna
|
b775664867
|
资源提交
|
2021-03-30 16:14:47 +08:00 |
ZhangBiao
|
fd9fc05994
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 14:34:40 +08:00 |
ZhangBiao
|
289af5b209
|
【活动优化】青龙秘宝界面优化
|
2021-03-30 14:34:25 +08:00 |
jiaoyangna
|
b67066cc66
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 14:22:46 +08:00 |
jiaoyangna
|
1ecb48c233
|
修改限时召唤图片
|
2021-03-30 14:22:37 +08:00 |
zhangqiang
|
4d3bbe4cfd
|
【称号坐骑时装】大闹天宫修改
|
2021-03-30 14:13:16 +08:00 |
jiaoyangna
|
df814045c5
|
协议提交
|
2021-03-30 13:58:28 +08:00 |
jiaoyangna
|
e6ad1d141d
|
mainpanel 提交
|
2021-03-30 13:56:50 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
ZhangBiao
|
73981e7200
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 13:43:59 +08:00 |
ZhangBiao
|
a0fb7f5714
|
【天宫寻宝】按钮增加特效
|
2021-03-30 13:43:46 +08:00 |
zhangqiang
|
2122997c3d
|
【称号坐骑时装】修改
|
2021-03-30 11:38:20 +08:00 |
ZhangBiao
|
d156471087
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 11:25:21 +08:00 |
ZhangBiao
|
32146997e4
|
【寻宝优化】优化天宫寻宝界面
|
2021-03-30 11:25:07 +08:00 |
jiaoyangna
|
4e83f9a540
|
Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-30 10:50:57 +08:00 |
jiaoyangna
|
ae51b547d5
|
活动提交
|
2021-03-30 10:48:34 +08:00 |
zhangqiang
|
33b4da13b3
|
【英雄升级特效显示修改】
|
2021-03-30 10:38:59 +08:00 |
zhangqiang
|
fb57fc97d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 10:28:12 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
jiaoyangna
|
eba43f84e2
|
删除log
|
2021-03-29 20:27:45 +08:00 |
jiaoyangna
|
02ee675843
|
每日豪礼修改提交
|
2021-03-29 20:20:02 +08:00 |
zhangqiang
|
0aad3aa01a
|
【称号坐骑时装】修改
|
2021-03-29 19:54:11 +08:00 |
zhangqiang
|
3115c6f586
|
【称号坐骑时装】界面修改
|
2021-03-29 18:42:47 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
zhangqiang
|
db6f2d0b32
|
【称号坐骑时装】提交
|
2021-03-29 17:53:40 +08:00 |
gaoxin
|
3ecded4430
|
【假战斗优化】运营活动、充值活动相关的假战斗跳过改为直接解锁,而不需要等玩家到达30级
|
2021-03-29 17:11:25 +08:00 |
gaoxin
|
91e13dc314
|
【超值基金】月卡不开超值基金不显示
|
2021-03-29 16:52:23 +08:00 |
zhangqiang
|
cbdfb75576
|
【称号坐骑时装】提交
|
2021-03-29 16:45:04 +08:00 |
gaoxin
|
918beb5c35
|
【法宝】界面特效资源位置全面屏显示错误
|
2021-03-29 15:37:25 +08:00 |
jiaoyangna
|
c16e912777
|
成长礼包,每日礼包修改提交
|
2021-03-29 15:16:32 +08:00 |
gaoxin
|
2a0ce862ae
|
【红点添加】限时兑换添加红点提示-关闭红点log
|
2021-03-29 14:54:13 +08:00 |
gaoxin
|
a599ef10f9
|
【红点添加】限时兑换添加红点提示
|
2021-03-29 14:37:15 +08:00 |
zhangqiang
|
51bb90edce
|
【称号坐骑时装】 协议 无尽副本修改
|
2021-03-29 12:07:28 +08:00 |
gaoxin
|
d575ddd70d
|
【技能资源】修复金吒技能报错
|
2021-03-29 11:30:07 +08:00 |
gaoxin
|
f3185f7fe4
|
【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题
|
2021-03-29 10:53:46 +08:00 |
jiaoyangna
|
e7dff66a4f
|
品阶错误修改
|
2021-03-29 10:15:25 +08:00 |
ZhangBiao
|
e0d05e175e
|
【福星高照】提交
|
2021-03-29 09:52:53 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
jiaoyangna
|
c131b4e521
|
每日豪礼修改
(cherry picked from commit da3b21d024 )
|
2021-03-27 19:26:59 +08:00 |
jiaoyangna
|
da3b21d024
|
每日豪礼修改
|
2021-03-27 19:25:04 +08:00 |
gaoxin
|
5ae49a698d
|
【特效】嫦娥,金吒特效修改
|
2021-03-27 19:02:40 +08:00 |
JieLing
|
5883b66fca
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:44:05 +08:00 |
gaoxin
|
0688f20ad6
|
【心魔试炼】排行榜有空格
|
2021-03-27 15:32:59 +08:00 |
gaoxin
|
e060430d61
|
【公会红包】修复滑动导致按钮位置错误
|
2021-03-27 15:20:26 +08:00 |
gaoxin
|
fbfb02fc34
|
【聊天】公会消息缓存添加,暂时删除公会红包跑马灯
|
2021-03-27 14:58:57 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
gaoxin
|
d48458f417
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-26 14:33:21 +08:00 |
gaoxin
|
a1778caa65
|
【公会红包】修复充值后报错扽问题
|
2021-03-26 14:33:12 +08:00 |
ZhangBiao
|
ad3b3c3e45
|
【牛气冲不动了】
|
2021-03-26 14:05:25 +08:00 |
ZhangBiao
|
dc187723c8
|
【牛气冲天】upview修改2
(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e)
|
2021-03-26 14:00:30 +08:00 |
ZhangBiao
|
b7cff350f9
|
【牛气冲天】修改
|
2021-03-26 13:56:01 +08:00 |
ZhangBiao
|
3c31b5b5bd
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-26 13:49:56 +08:00 |
ZhangBiao
|
dc50f89214
|
【牛气冲天】upview提交
|
2021-03-26 13:49:41 +08:00 |
gaoxin
|
b18ad8487a
|
【战斗】casting层级调整,失败界面打开1秒后才能关闭
|
2021-03-26 12:15:48 +08:00 |
gaoxin
|
cb15f601b3
|
【聊天】去除登录之前的消息不显示的限制
|
2021-03-26 11:31:14 +08:00 |
gaoxin
|
1801a3d820
|
【十绝阵】排名数据超过20,滑动时显示错误的问题
|
2021-03-26 11:17:46 +08:00 |
gaoxin
|
fd5ef82b5f
|
【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题
|
2021-03-26 10:13:05 +08:00 |
ZhangBiao
|
b7c51cbf48
|
【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
|
2021-03-25 16:33:33 +08:00 |
jiaoyangna
|
8aa411244e
|
灵兽秘卷修改提交
|
2021-03-25 16:21:34 +08:00 |
jiaoyangna
|
cfa67e8479
|
删除log
|
2021-03-25 15:34:57 +08:00 |
jiaoyangna
|
299a7ceff1
|
【天书秘卷】 修改
|
2021-03-25 15:34:05 +08:00 |
ZhangBiao
|
3b99759f6f
|
【牛气冲天】报空修复
(cherry picked from commit 756e920596af01046ab53a971423b77243a42678)
|
2021-03-25 15:20:19 +08:00 |
ZhangBiao
|
16853d09c3
|
【牛气冲天】物品特效、红点检测
(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1)
|
2021-03-25 15:02:13 +08:00 |
ZhangBiao
|
0a4d9a925b
|
【牛气冲天】主城报错提交
|
2021-03-25 11:35:25 +08:00 |
jiaoyangna
|
dd075e3c4c
|
itemview 灰色修改
|
2021-03-25 11:33:44 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
ZhangBiao
|
304a175fc8
|
【牛气冲天】完成
|
2021-03-25 11:00:58 +08:00 |
jiaoyangna
|
4f188f1ef1
|
未进版本功能隐藏
|
2021-03-25 10:57:54 +08:00 |
jiaoyangna
|
10f239582a
|
激活两次修改
|
2021-03-25 10:45:50 +08:00 |
gaoxin
|
c8327cbb92
|
【森罗幻境】临时修改数据类型不统一导致战斗报错的问题
|
2021-03-25 10:43:53 +08:00 |
jiaoyangna
|
646f3ae5de
|
新字不消失修改
|
2021-03-25 10:42:42 +08:00 |
jiaoyangna
|
a98e8e74f9
|
新字不消失修改
|
2021-03-25 10:39:49 +08:00 |
ZhangBiao
|
5768d133f0
|
【牛气冲天】提交
|
2021-03-25 10:34:11 +08:00 |
ZhangBiao
|
3a5b35a399
|
【牛气冲天】提交
|
2021-03-25 09:58:36 +08:00 |
gaoxin
|
17f0a9ed1e
|
【bug】零元礼包不再算做充值,修复第一天领取零元礼包,第二天充值会解锁第二天的首充礼包,但不能领取的问题。同时修复领取0元礼包也会导致自动弹出首充的问题。
|
2021-03-24 21:06:02 +08:00 |
zhangqiang
|
d00236d6d0
|
【称号 时装 坐骑】 协议数据提交
|
2021-03-24 21:05:31 +08:00 |
ZhangBiao
|
e8219c11b0
|
【牛气冲天】提交
|
2021-03-24 20:19:40 +08:00 |
jiaoyangna
|
f972b1646a
|
主题活动提交
|
2021-03-24 18:16:30 +08:00 |
jiaoyangna
|
b0887238d0
|
主题活动修改提交
|
2021-03-24 18:01:33 +08:00 |
ZhangBiao
|
481540080b
|
【牛气冲天】提交
|
2021-03-24 17:06:20 +08:00 |
zhangqiang
|
6f0593707f
|
【十绝阵个人排行】不显示玩家名字
|
2021-03-24 16:32:31 +08:00 |
zhangqiang
|
4939c4da92
|
【称号坐骑时装】部分资源提交
|
2021-03-24 16:31:14 +08:00 |
ZhangBiao
|
b63845938a
|
【牛气冲天】提交
|
2021-03-24 13:43:56 +08:00 |
jiaoyangna
|
54586ae204
|
天书秘卷提交
|
2021-03-24 10:55:33 +08:00 |
ZhangBiao
|
2c5159fc11
|
【五级图标显示】
|
2021-03-24 09:48:35 +08:00 |
jiaoyangna
|
3bd78655a2
|
灵兽提交
|
2021-03-23 20:33:21 +08:00 |
ZhangBiao
|
c9670aae58
|
【五级前不显示任何活动】
|
2021-03-23 20:28:31 +08:00 |
gaoxin
|
8644d27aaa
|
【界面优化】部分界面显示优化修改
|
2021-03-23 17:26:16 +08:00 |
jiaoyangna
|
1f036b6793
|
添加头像置灰
|
2021-03-23 17:20:48 +08:00 |
jiaoyangna
|
fbed4d34ff
|
解锁条件修改
|
2021-03-23 17:10:04 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
44806a302d
|
红点提交
|
2021-03-23 16:52:19 +08:00 |
gaoxin
|
c5d1dab173
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 16:34:19 +08:00 |
zhangqiang
|
3618464a15
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-23 16:22:57 +08:00 |
gaoxin
|
8b62a5cd43
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-23 16:15:40 +08:00 |
gaoxin
|
3a8a8ddeeb
|
【登录】流程修改,添加错误码处理
|
2021-03-23 16:15:32 +08:00 |
jiaoyangna
|
001d6e16bc
|
主城入口提交
|
2021-03-23 16:02:22 +08:00 |
zhangqiang
|
c4c5bb1074
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-23 15:53:59 +08:00 |
jiaoyangna
|
3334257425
|
添加天书秘卷入口
|
2021-03-23 15:37:39 +08:00 |
zhangqiang
|
a56d71c4f8
|
【公会副本】bug修改
|
2021-03-23 15:25:00 +08:00 |
jiaoyangna
|
cfa63c1830
|
筛选提交
|
2021-03-23 15:23:37 +08:00 |
jiaoyangna
|
2e31e176cc
|
红点提交
|
2021-03-23 15:16:38 +08:00 |
gaoxin
|
145eb02c06
|
【策划场景】灵兽战斗中添加名字显示
|
2021-03-23 15:04:33 +08:00 |
jiaoyangna
|
218110d709
|
筛选排序提交
|
2021-03-23 14:56:13 +08:00 |
gaoxin
|
c40b734145
|
【策划场景】灵兽立绘调整界面添加
|
2021-03-23 14:42:14 +08:00 |
gaoxin
|
1b9173f931
|
【bug】修复充值界面在全面屏下文字显示不全的问题-expertpanel
|
2021-03-23 14:25:11 +08:00 |
gaoxin
|
671edf8366
|
【bug】修复充值界面在全面屏下文字显示不全的问题
|
2021-03-23 14:22:25 +08:00 |
jiaoyangna
|
9e19cd5322
|
红点提交
|
2021-03-23 14:13:02 +08:00 |
gaoxin
|
96fb520ace
|
【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进
|
2021-03-23 11:17:55 +08:00 |
jiaoyangna
|
cd984427c1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-23 11:00:25 +08:00 |
jiaoyangna
|
b859239c90
|
首充跳转修改
|
2021-03-23 10:59:59 +08:00 |
ZhangBiao
|
dfa2efdc76
|
【大闹天宫】查看圣物文字过小调整
|
2021-03-23 10:11:36 +08:00 |
ZhangBiao
|
83040f2c87
|
【主城】预设结构调整
|
2021-03-23 09:54:11 +08:00 |
ZhangBiao
|
7bac8e3d8c
|
【八日领奖】需要改成可查看宝箱
|
2021-03-22 20:56:36 +08:00 |
ZhangBiao
|
dc38d33738
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-22 20:42:02 +08:00 |
ZhangBiao
|
dcc09321dd
|
【自选宝箱】按钮覆盖修改
|
2021-03-22 20:41:51 +08:00 |
gaoxin
|
7fb9a6ea71
|
【战斗】主动上报日志功能关闭
|
2021-03-22 20:37:34 +08:00 |
gaoxin
|
52cace8d64
|
【公会】援助界面文字和进度条分离显示
|
2021-03-22 20:17:06 +08:00 |
ZhangBiao
|
207d85e2a2
|
【牛气冲天】提交
|
2021-03-22 20:08:18 +08:00 |
gaoxin
|
d7ac77375f
|
【bug】修复公会boss点击挑战再返回伤害列表不显示的问题
|
2021-03-22 19:50:01 +08:00 |
gaoxin
|
3c98337b33
|
【bug】战斗跳过未解锁文字提示修改
|
2021-03-22 19:44:24 +08:00 |
wangzhenxing
|
1e2db6040e
|
皮肤称号坐骑预设修改
|
2021-03-22 17:31:55 +08:00 |
jiaoyangna
|
a79e67097e
|
天书秘卷提交
|
2021-03-22 17:05:00 +08:00 |
gaoxin
|
c3961b9501
|
【公会】邀请,红包,副本文字显示修改
|
2021-03-22 16:25:10 +08:00 |
jiaoyangna
|
08f41d473c
|
天书秘卷提交
|
2021-03-22 16:22:55 +08:00 |
zhangqiang
|
d9dcba2574
|
【称号坐骑皮肤-----------】开始
|
2021-03-22 16:16:25 +08:00 |
jiaoyangna
|
3931ef4af2
|
天书秘卷提交
|
2021-03-22 15:42:56 +08:00 |
jiaoyangna
|
56ee509832
|
天书秘卷 提交
|
2021-03-22 15:28:27 +08:00 |
jiaoyangna
|
a4facd8d13
|
天书秘卷
|
2021-03-22 15:16:29 +08:00 |
gaoxin
|
4b8f5cd535
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-22 13:54:18 +08:00 |
gaoxin
|
f2de4a8a53
|
【大闹天宫】圣物品质框默认+3
|
2021-03-22 13:54:14 +08:00 |
zhangqiang
|
830f7d3dd9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-22 13:48:06 +08:00 |
zhangqiang
|
dc5d0a2d12
|
【修复主城人物层级bug】
|
2021-03-22 13:47:59 +08:00 |
ZhangBiao
|
3d665074a2
|
【牛气冲天】提交
|
2021-03-22 11:09:49 +08:00 |
gaoxin
|
f5d09b6cd4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-20 22:13:07 +08:00 |
gaoxin
|
7e0e5e198a
|
【sdk】添加上传支付订单id的接口
|
2021-03-20 22:12:51 +08:00 |
JieLing
|
905e60e306
|
【场景】测试服场景上传
|
2021-03-20 22:11:33 +08:00 |
gaoxin
|
cd87dff0a7
|
【网络】http请求添加错误lua回调
|
2021-03-20 15:01:55 +08:00 |
gaoxin
|
fccfeedba0
|
【sdk】避免出现sdk初始化慢导致无法自动打开登录界面的问题
|
2021-03-20 15:00:44 +08:00 |
ZhangBiao
|
cae60a1318
|
【自选宝箱】界面调整
|
2021-03-19 23:54:24 +08:00 |
ZhangBiao
|
2f658f1157
|
【装备种类显示】
|
2021-03-19 21:30:22 +08:00 |
gaoxin
|
da1ad31e4c
|
【bug】修复兑换码按钮不显示的问题
|
2021-03-19 21:01:27 +08:00 |