Commit Graph

2998 Commits (9c412cad00c05450704df3e9cfddc81773f87a89)
 

Author SHA1 Message Date
jiaoyangna 9c412cad00 [四灵试炼] 提交 2020-12-21 20:24:36 +08:00
jiaoyangna 6c9a8c7687 [四灵试炼] 预设提交 2020-12-21 13:43:04 +08:00
jiaoyangna 6b79244162 [generalbigpopup] prefab 2020-12-21 10:49:28 +08:00
jiaoyangna 22a8cb5cee Merge branch '0功能/建木神树' into 0功能/silingshilian 2020-12-21 10:48:09 +08:00
jiaoyangna 46a64016ea [generalbigpopup] 2020-12-21 10:47:55 +08:00
jiaoyangna c4a0cab9a8 Merge branch '0功能/建木神树' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-12-21 10:46:53 +08:00
jiaoyangna 8ff2d808cd 四灵试炼 提交 2020-12-21 10:37:37 +08:00
jiaoyangna 5aa171267d 四灵协议提交 2020-12-21 09:51:08 +08:00
ZhangBiao 45b8899cfe 【建木神树】排行榜查看其他人信息 2020-12-16 13:49:56 +08:00
ZhangBiao 0b6c8362b6 【建木神树】提交 2020-12-15 17:27:16 +08:00
ZhangBiao 72e22a7234 【建木神树】战力对上了,就差调两个界面了 2020-12-14 17:14:42 +08:00
jiaoyangna 4519f70c54 四灵试炼commit 2020-12-14 09:54:50 +08:00
ZhangBiao d762af1660 【建木神树】神应属性界面 2020-12-11 16:03:27 +08:00
jiaoyangna 26c6fa1894 [四灵试炼] 预设代码提交 2020-12-10 16:23:13 +08:00
ZhangBiao 44c848ac37 【建木神树】 2020-12-10 14:15:07 +08:00
jiaoyangna b460087193 【博文多识】 2020-12-10 11:35:56 +08:00
ZhangBiao 048a68a932 【建木神树】提交 2020-12-10 11:26:56 +08:00
ZhangBiao 27004f28ed path 2020-12-09 17:27:50 +08:00
ZhangBiao 6df7f2ef10 【道具自选箱】bug修复 2020-12-09 17:19:53 +08:00
ZhangBiao 35c7a77029 【建木神树】预设提交 2020-12-09 16:51:26 +08:00
ZhangBiao eb3f8a5aaa 【GM】GM 2020-12-09 09:36:02 +08:00
jiaoyangna 8b7a227a54 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
ZhangBiao f649fccdb9 path路径 2020-12-08 15:18:50 +08:00
ZhangBiao b9a3f19509 【GM】钱降一位、一键宝物、一键装备(顶级)
(cherry picked from commit 4ef08d456e)
2020-12-08 15:05:35 +08:00
ZhangBiao 2b3ad467dd 【百宝商会】时间字体颜色提交 2020-12-07 19:48:21 +08:00
ZhangBiao 1c7ac7e8cc 【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae)
2020-12-07 19:18:04 +08:00
wangzhenxing b9a112736b [战斗] 修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1 2020-12-07 18:03:23 +09:00
zhangqiang 62fcc1fa19 【战斗 】 给英雄附加战斗单位类型 2020-12-07 18:02:49 +09:00
wangzhenxing 7da566dc76 [战斗] 神女庇佑最佳技能表现修改,吞鲸魂印修改 2020-12-07 18:01:57 +09:00
liujiaqi f3dc2797fa 新增3个灵兽小头像 2020-12-07 17:50:05 +08:00
jiaoyangna a446b83908 冲突修改提交 2020-12-07 16:29:22 +08:00
jiaoyangna b1d1aadec7 伏虎罗汉 修改 2020-09-17 12:37:43 +08:00
jiaoyangna 2df6f4076e [变幻莫测] 资源提交 2020-09-17 12:37:02 +08:00
jiaoyangna 2e4e34ef8d 灵兽宝阁 2020-09-17 12:36:43 +08:00
zhangqiang 6a0a52997c 变幻莫测 提交 2020-09-17 12:35:45 +08:00
zhangqiang 3292605ff6 【资源导入】 音效替换 2 个 2020-12-05 15:18:13 +08:00
zhangqiang 07cbb5f14f 【资源导入】 音效 三个 2020-12-05 15:18:06 +08:00
zhangqiang e5b9abe11a 【资源导入】 live2d 新将 + 新灵兽 2020-12-05 15:17:56 +08:00
zhangqiang ccb41e0c15 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2020-12-05 15:17:48 +08:00
zhangqiang b1e1fdcab0 【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改 2020-12-05 13:31:39 +08:00
zhangqiang 01fd511ea1 【巅峰赛】 竞猜结果前端显示错误 2020-12-05 13:31:14 +08:00
zhangqiang ab30b910b0 【背包 bug】 装备页签显示的 当前数量 不应是种类 是总数量 修复 2020-12-05 13:29:47 +08:00
zhangqiang 3de1b43922 【神将升级 优化】 觉醒提示文字修改 2020-12-05 13:29:32 +08:00
zhangqiang 6654c9c3b8 【大闹天宫】 新增需求 增加圣物 新标 提示 2020-12-05 13:20:42 +08:00
zhangqiang 1629164837 【竞技场】 防守记录积分显示修改 2021-01-19 23:00:35 +08:00
ZhangBiao 383fa08e90 【竞技场】赢了我加分对方减分,输了无变化
(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5)
2021-01-14 21:14:04 +08:00
gaoxin 119be29c7d 【角色】修复角色被动技能数量计算错误,兼容多合一被动 2020-11-30 21:17:56 +08:00
gaoxin 4dbbbc7929 【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错 2020-11-30 20:35:14 +08:00
zhangqiang b0f9e59672 【车迟】抢夺空队伍 提示错误 2020-11-30 11:09:07 +08:00
zhangqiang f696619328 【编队战力】 修改战力显示 2 未合 local 2020-11-30 10:17:44 +08:00