Commit Graph

5727 Commits (38947760c154c8564284b3a314f43460c173bec0)

Author SHA1 Message Date
yuanshuai 38947760c1 【四象心法】bug修改 2021-09-11 13:37:26 +08:00
yuanshuai e91140175f 四象心法添加通用等级限制 2021-09-10 15:44:32 +08:00
yuanshuai ee557e993a 开启修行等级限制 2021-09-10 15:08:50 +08:00
yuanshuai a89d168e50 【四象心法】功能完善 2021-09-10 14:37:47 +08:00
yuanshuai 1327abb290 四象心法修改 2021-09-10 11:22:08 +08:00
yuanshuai 4c66f50e66 Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
2021-09-10 09:38:55 +08:00
yuanshuai 247ad9fdc7 【四象心法提交】 2021-09-09 20:45:12 +08:00
jiaoyangna c5fc2ddedb 推送礼包修改提交 2021-09-09 18:11:37 +08:00
jiaoyangna ce674fc2ab 推送礼包文案修改 2021-09-09 17:31:25 +08:00
jiaoyangna fd29cae402 界面销毁时删除红点绑定 2021-09-09 14:27:38 +08:00
jiaoyangna d010e309ca 建木神树 升级修改提交 2021-09-09 14:03:14 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
gaoxin 5d739f1291 【十绝阵】排行滑动数据错乱 2021-09-09 11:19:11 +08:00
jiaoyangna 4727998055 没有图片问题修改
(cherry picked from commit 76d8399ac9ecd0c999ed6e8b53c7b7e231b73a16)
2021-09-09 10:55:42 +08:00
gaoxin 77ea33d675 【商店】从其他界面返回时刷新显示 2021-09-09 10:50:03 +08:00
gaoxin f4d0afde52 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-09 10:45:45 +08:00
gaoxin 5e938b5141 【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题 2021-09-09 10:45:40 +08:00
jiaoyangna f07b92346a www下载错误卡死修改
(cherry picked from commit 8c146837d826d97820a4eef73f1a125bf448dd39)
2021-09-09 10:43:08 +08:00
jiaoyangna ef469e7ce7 山河社稷图引导卡死修改 2021-09-08 19:02:34 +08:00
gaoxin 021de51a59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-08 18:29:05 +08:00
gaoxin 29d1b095e5 【碎片详情】碎片详情添加灵兽和神将的查看-特殊碎片不显示查看按钮 2021-09-08 18:28:50 +08:00
gaoxin 992608f7a4 【无尽地图】部分事件未解绑 2021-09-08 18:27:44 +08:00
gaoxin c4bced89f7 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
jiaoyangna 250683a822 山河社稷图引导卡死修改 2021-09-08 18:19:51 +08:00
jiaoyangna 7abd0955e2 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 12:19:59 +08:00
jiaoyangna 1757b3cad7 好友宝物修改提交 2021-09-08 12:00:34 +08:00
jiaoyangna b1b0bf1cab 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 11:11:30 +08:00
jiaoyangna a012ece114 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 10:27:26 +08:00
gaoxin d6961c19fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-07 19:43:34 +08:00
gaoxin 2a23609ed6 【战斗】添加缺失的方法 2021-09-07 19:43:08 +08:00
jiaoyangna 4fd5f70e5b 商店购买灵兽不弹恭喜获得修改
(cherry picked from commit 1cbd4a8965)
2021-09-07 19:17:13 +08:00
jiaoyangna 1cbd4a8965 商店购买灵兽不弹恭喜获得修改 2021-09-07 19:15:46 +08:00
gaoxin 0bd0137a2b 【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log
2021-09-07 15:14:10 +08:00
gaoxin 79832f3232 【碎片详情】碎片详情添加灵兽和神将的查看 2021-09-07 11:40:12 +08:00
zhangshanxue c3dd7b40c4 Merge branch 'china/test' into china/xq 2021-09-06 19:24:18 +08:00
gaoxin 0febc6ae6a 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:56 +08:00
gaoxin b5ad62620f 【背包】修复滑动后切换页签不回到最顶部的 问题 2021-09-06 19:23:41 +08:00
gaoxin b953fac2a0 【巅峰赛】选拔赛组界面添加角色信息展示 2021-09-06 17:58:31 +08:00
zhangshanxue 053650b3e7 Merge branch 'china/test' into china/xq 2021-09-06 16:36:25 +08:00
gaoxin 59ec0d6f20 【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题 2021-09-06 16:35:46 +08:00
zhangshanxue 8c277426e5 【奖励】修复关闭界面时部分数据未还原 2021-09-06 13:55:12 +08:00
zhangshanxue 54cae546af Merge branch 'china/test' into china/xq 2021-09-06 11:47:33 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
zhangshanxue ddab583582 Merge branch 'china/dev' into china/xq 2021-09-06 11:02:57 +08:00
gaoxin 17001dd7d8 【防沉迷】游戏内添加未成年人判断 2021-09-06 11:00:34 +08:00
jiaoyangna 129c5d67d1 Merge branch '0功能/silingshilian' into china/xq 2021-09-03 18:57:34 +08:00
jiaoyangna 5af2fc261d 心魔修改提交 2021-09-03 18:56:46 +08:00
zhangshanxue 337000c21f Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq 2021-09-03 18:45:19 +08:00
jiaoyangna 1b82990227 【ID1018356】
【四灵试炼】在线过渡第二天,新开启的试炼入口没红点,关闭的入口红点不消失
2021-09-03 16:29:30 +08:00
zhangshanxue 4d98bd0081 Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq 2021-09-03 16:12:28 +08:00