Commit Graph

8057 Commits (ab7570f3bbf184f803eb54bd510006af07517b1e)

Author SHA1 Message Date
wangzhenxing c27379226c aaaaaaaaaaaaa 2021-09-09 16:27:36 +08:00
gaoxin b1c987b16f 【玉虚】界面显示优化,星星显示优化 2021-09-09 16:22:35 +08:00
wangzhenxing 49a7a2b242 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-09-09 15:44:33 +08:00
wangzhenxing 0d82056bc2 主界面显示修改 2021-09-09 15:44:19 +08:00
gaoxin 065734184e 【玉虚】商店跳转添加 2021-09-09 15:16:41 +08:00
jiaoyangna fd29cae402 界面销毁时删除红点绑定 2021-09-09 14:27:38 +08:00
gaoxin 60b842e2ab 【排行榜】报错修复 2021-09-09 14:05:44 +08:00
jiaoyangna d010e309ca 建木神树 升级修改提交 2021-09-09 14:03:14 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +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
ZhangBiao 1fefbb43e6 【七界试炼】提交 2021-09-09 11:10:43 +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
ZhangBiao b05227f79e 【七界试炼】提交 2021-09-08 17:32:48 +08:00
ZhangBiao 2fe984719b 【七界试炼】遗物1/2 2021-09-08 16:26:40 +08:00
ZhangBiao 6ec532f769 【七界试炼】排行奖励 2021-09-08 14:36:37 +08:00
liujiaqi 947a4fa368 【资源】织女技能字 2021-09-08 14:02:27 +08:00
luyao 150f6e0909 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:51:49 2021-09-08 13:51:49 +08:00
luyao b05a0b108d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-08 13:50:01 +08:00
luyao 9b71c0e53e bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:45:19 2021-09-08 13:45:19 +08:00
luyao 681d0be397 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/08,13:44:18 2021-09-08 13:44:18 +08:00
jiaoyangna 7abd0955e2 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 12:19:59 +08:00
jiaoyangna 1757b3cad7 好友宝物修改提交 2021-09-08 12:00:34 +08:00
jiaoyangna ed7c2d9d5e 装备界面修改 2021-09-08 11:45:04 +08:00
jiaoyangna c18094ff97 精炼等级位置修改 2021-09-08 11:37:37 +08:00
jiaoyangna b1b0bf1cab 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 11:11:30 +08:00
jiaoyangna a012ece114 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-08 10:27:26 +08:00
ZhangBiao 1693300255 【七界试炼】目标特性 2021-09-08 10:06:24 +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
ZhangBiao ea1b521143 【七界试炼】提交 2021-09-07 19:27:05 +08:00
ZhangBiao adb77b501e Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 19:26:13 +08:00
ZhangBiao db522d563e 【七界试炼】先显示界灵 2021-09-07 19:23:16 +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
luyao 2972a973c5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-07 19:00:24 +08:00
luyao 67326aa278 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,19:00:05 2021-09-07 19:00:05 +08:00
luyao 19551d50f9 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/07,18:46:08 2021-09-07 18:46:09 +08:00
wangzhenxing 03b2acbb91 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-07 18:45:25 +08:00
wangzhenxing c531b3776b 玉虚论道提交 2021-09-07 18:27:23 +08:00
gaoxin 2fa2fe0a28 【织女】live2d资源没有透明通道 2021-09-07 18:26:43 +08:00
ZhangBiao 8c95c7f8ad 【七界试炼】主界面基本完成 2021-09-07 18:09:33 +08:00
zhangshanxue e4f65ba04b Merge branch 'china/test' into china/xq 2021-09-07 18:07:31 +08:00
wangzhenxing 5f0bfe53bd 玉虚论道提交 2021-09-07 17:05:46 +08:00
gaoxin 8b57b7df1f 【逍遥游】西贺牛州选定区域优化 2021-09-07 15:42:05 +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
gaoxin 19e83da85c 【资源】资源名重复 2021-09-07 10:27:34 +08:00
gaoxin b74d5ebf38 【资源】资源名重复 2021-09-07 10:27:09 +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
jiaoyangna 466bee75bd 四灵排行榜类型修改 2021-09-06 19:10:26 +08:00
gaoxin 17ebbc1872 【优化】灵兽商城商品上显示当前已有的灵兽碎片 2021-09-06 18:19:45 +08:00
gaoxin b953fac2a0 【巅峰赛】选拔赛组界面添加角色信息展示 2021-09-06 17:58:31 +08:00
ZhangBiao 6078ae545a 【七界试炼】提交 2021-09-06 17:21:53 +08:00
zhangshanxue 053650b3e7 Merge branch 'china/test' into china/xq 2021-09-06 16:36:25 +08:00
gaoxin 34b09a565e Merge branch 'china/dev' into china/test 2021-09-06 16:36:04 +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 6f08fe74b2 Merge branch 'china/dev' into china/test 2021-09-06 11:46:54 +08:00
gaoxin 11495d1076 【山河社稷图】修复奖励界面报错导致卡死 2021-09-06 11:45:30 +08:00
ZhangBiao d3ee7eda1d 【七界试炼】资源提交 2021-09-06 11:42:32 +08:00
ZhangBiao 2d7ba67846 【七界试炼】提交 2021-09-06 11:37:49 +08:00
ZhangBiao d564f0cf11 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-09-06 11:16:40 +08:00
ZhangBiao a471905a9f Merge branch 'china/dev' into 0功能/七界试炼 2021-09-06 11:13:15 +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 17f6cb8ff1 报错修改 2021-09-03 18:43:03 +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
zhangshanxue 39fc099fe6 Merge branch 'china/dev' into china/xq
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-03 16:01:20 +08:00
jiaoyangna fb4a7afdc0 【ID1018360】
【四灵试炼】助战入口显示红点,里面没可操作的神将
2021-09-03 15:27:55 +08:00
jiaoyangna 5ffd4eab51 跑马灯修改提交 2021-09-03 15:14:18 +08:00
ZhangBiao 21d6b01106 【修行】元婴期突破空白文字修改 2021-09-03 15:10:38 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 009a17a25a 【战力】漏提交 2021-09-03 10:19:51 +08:00
ZhangBiao 5ea7acdef7 【幸运探宝】提交 2021-09-02 22:35:44 +08:00
ZhangBiao 72c42eb871 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 22:25:08 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
gaoxin 316adf6fbd 【登录】优化登录失败时,界面文字提示 2021-09-02 22:12:58 +08:00
ZhangBiao fbfa80611a 【幸运摊薄】时间显示 2021-09-02 20:58:11 +08:00
zhangshanxue 4b6bce3b32 Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq 2021-09-02 20:16:05 +08:00
jiaoyangna e35b64be86 generalpopup 冲突解决 2021-09-02 19:52:01 +08:00
zhangshanxue 03b62b4e44 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_skill_yangjian/Prefab/fx_yangjian_shouji.prefab.meta
2021-09-02 19:45:05 +08:00
jiaoyangna 4d5876eb28 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
2021-09-02 19:33:48 +08:00
jiaoyangna 773d31f146 报错修改 2021-09-02 18:18:17 +08:00
jiaoyangna 3011fc531f 神树升级修改提交 2021-09-02 18:08:35 +08:00
ZhangBiao f6d05b433d 【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致 2021-09-02 18:07:49 +08:00
jiaoyangna 19f1815558 特效修改提交 2021-09-02 17:50:59 +08:00
jiaoyangna 13909e60aa 编队id修改 2021-09-02 17:29:44 +08:00
jiaoyangna 8ae3228319 无挑战次数描述修改 2021-09-02 16:38:51 +08:00
jiaoyangna 31dd32a19b 添加最大等级限制 2021-09-02 16:33:51 +08:00
jiaoyangna 96f2530ae8 加号修改 2021-09-02 16:20:33 +08:00
jiaoyangna 37c1c77737 添加道具 太初之气 加号 2021-09-02 16:17:26 +08:00
jiaoyangna ac0955bb13 宝器修改提交 2021-09-02 16:12:37 +08:00
jiaoyangna 186b2ca0c3 四灵修改提交 2021-09-02 16:09:04 +08:00
gaoxin aa26a94d60 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 16:00:46 +08:00
gaoxin 45ddf4e09e 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 14:27:18 +08:00
jiaoyangna 1dd4e984cb 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-02 14:22:50 +08:00
jiaoyangna f087a9aa71 Revert "预设适配修改提交"
This reverts commit a592f4d5f3.
2021-09-02 14:20:26 +08:00
ZhangBiao 61c16f60f2 【优化】将竞技场赛季倒计时提示文字改为能看清的文字 2021-09-02 13:44:42 +08:00
jiaoyangna 68ed8e3b40 位置修改 2021-09-02 11:42:43 +08:00
jiaoyangna 264328e859 适配修改 2021-09-02 11:38:49 +08:00
ZhangBiao 9fe8a5c0d2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:34:26 +08:00
ZhangBiao d3f7213de0 【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑 2021-09-02 11:34:15 +08:00
jiaoyangna a592f4d5f3 预设适配修改提交 2021-09-02 11:24:09 +08:00
jiaoyangna 88f88d1249 适配修改提交 2021-09-02 11:20:18 +08:00
ZhangBiao bbca72b6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:19:39 +08:00
ZhangBiao 6bbf30e344 【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000 2021-09-02 11:19:29 +08:00
liujiaqi e9bb0163de 【资源】杨戬施法特效 2021-09-02 10:42:28 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
jiaoyangna 41831fad79 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
2021-09-01 19:35:28 +08:00
jiaoyangna 9ab223d577 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-01 19:20:34 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
jiaoyangna 75fc33c18b 回放资源修改提交 2021-09-01 18:17:14 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 3b8fc3700f 排行榜修改提交 2021-09-01 17:21:33 +08:00
jiaoyangna f516731201 一键上阵修改提交 2021-09-01 17:12:25 +08:00
jiaoyangna bfe127012e 排行榜修改提交 2021-09-01 16:39:09 +08:00
jiaoyangna 19be216616 升级修改提交 2021-09-01 16:25:58 +08:00
wangzhenxing 8476199128 玉虚论道段位特效提交 2021-09-01 16:20:52 +08:00
jiaoyangna 3373e3daf4 升级修改提交 2021-09-01 16:07:33 +08:00
jiaoyangna 0f3e76e00f 层级修改 2021-09-01 14:52:13 +08:00
jiaoyangna 3372e2a965 已激活属性之间的空隙过大 2021-09-01 14:49:58 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna 13e7935d1d 下方显示替换红点,点击一键装备无法替换 2021-09-01 12:47:30 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
jiaoyangna 0654020f6a 建木神树快速升级 2021-09-01 11:49:22 +08:00
jiaoyangna 1245d7635d 四灵修改 2021-09-01 11:02:07 +08:00
jiaoyangna 49a4b32138 四灵第二次修改 2021-09-01 10:43:57 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
jiaoyangna d9bef4f49a 战力修改提交 2021-08-31 18:08:57 +08:00
jiaoyangna 207a4eb512 战力修改提交 2021-08-31 18:07:34 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna 82b992c4ca 我的助战报错修改提交 2021-08-31 17:12:30 +08:00
jiaoyangna d660fe362e 装备宝物界面修改提交 2021-08-31 17:06:01 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
gaoxin 1c7d7427e4 【战斗】被动添加时Log 2021-08-31 15:22:02 +08:00
wangzhenxing 2211be3b61 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 15:21:55 +08:00
gaoxin 9eb136df40 【战斗】添加一些战斗日志 2021-08-31 15:21:27 +08:00
gaoxin 7ef231e7a8 【战斗】修复战斗报错 2021-08-31 15:21:22 +08:00
wangzhenxing dcacc94fad 玉虚论道脚本预设提交 2021-08-31 15:10:27 +08:00
jiaoyangna dd93f737ff 排行榜上好友宝器修改 2021-08-31 15:05:17 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
jiaoyangna d7d8a6071b 特希奥层级修改提交 2021-08-31 14:41:35 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
jiaoyangna 72931e8ad6 失败返回报错修改 2021-08-31 13:59:03 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 209bd7ed0c 四元阵特效修改提交
(cherry picked from commit f355940615)
2021-08-31 10:54:32 +08:00
jiaoyangna 03b00d7762 四元阵特效修改提交 2021-08-31 10:52:58 +08:00
jiaoyangna f355940615 四元阵特效修改提交 2021-08-31 10:52:02 +08:00
jiaoyangna 0027722366 四灵修改提交 2021-08-30 20:07:20 +08:00
ZhangBiao 4e9ce855f2 【玩家神将信息界面】魂印本身战力不增加修改 2021-08-30 18:45:21 +08:00
ZhangBiao 6dca507aaf 【推荐工会】 2021-08-30 18:14:13 +08:00
ZhangBiao 911c1849b2 【工会推荐】搜索修改 2021-08-30 18:14:07 +08:00
ZhangBiao ec638f7c7a 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 18:14:03 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
ZhangBiao 1f2a21a587 【推荐工会】 2021-08-30 16:24:30 +08:00
wangzhenxing 01ad6f3229 【玉虚轮道】=====功能入口提交 2021-08-30 15:41:14 +08:00
ZhangBiao f484e60f87 【工会推荐】搜索修改 2021-08-30 15:37:10 +08:00
ZhangBiao ca59c47cce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:29:35 +08:00
ZhangBiao 671f3cfb28 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 15:29:22 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
wangzhenxing 172f800d2e 【战斗】=============杨戬新技能特效提交 2021-08-30 14:14:48 +08:00
zhangshanxue 09fba90ce1 Merge commit 'dd9392871e43553845788df3666c8e264ada663d' into china/test 2021-08-28 19:10:42 +08:00
skuld 1cb0353b43 添加log 2021-08-28 17:21:36 +08:00
jiaoyangna f11e33efc1 添加log 2021-08-28 17:12:10 +08:00
jiaoyangna dd9392871e 十绝阵公会名字显示错误 2021-08-28 17:03:22 +08:00
zhangshanxue 2e786a967e Merge branch 'china/dev' into china/test 2021-08-28 15:42:36 +08:00
gaoxin c19cfb3d49 【提审】关闭太初密卷显示 2021-08-28 15:26:35 +08:00
zhangshanxue fe15c46f87 Merge remote-tracking branch 'origin/china/dev' into china/test 2021-08-28 15:21:19 +08:00
gaoxin ee4a465c41 【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题 2021-08-28 15:20:44 +08:00
gaoxin eed381315d 【提审】添加石矶提审服资源 2021-08-28 15:04:13 +08:00
gaoxin 908ca14632 【shader】添加对所有平台的支持 2021-08-28 13:40:15 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
zhangshanxue 51d59cd8ef Merge branch 'china/dev' into china/test 2021-08-27 18:24:42 +08:00
wangzhenxing 6ef1d6c643 【战斗】===========被动115 DOT类Buff 清除逻辑修改 2021-08-27 18:02:50 +08:00
zhangshanxue ab15ece104 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta
#	Assets/ManagedResources/Spine/c_0038_02.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat
#	Assets/ManagedResources/Spine/c_0043_02.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-27 16:42:18 +08:00
ZhangBiao 7ca7e78761 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-27 15:59:38 +08:00
ZhangBiao 12c2fd7316 【推荐公会】增加分页请求 2021-08-27 15:59:22 +08:00
wangzhenxing 58f34e049b 【战斗】=============被动91,160 修改提交 2021-08-27 15:27:53 +08:00
gaoxin a3f9967651 【提审服】精卫穿秋裤,慈航穿棉袄 2021-08-27 15:23:03 +08:00
zhangqiang 4abca9f0a2 漏提 2021-08-27 15:15:42 +08:00
zhangqiang 50268807c3 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 15:12:22 +08:00
gaoxin 792a72676a 【适龄提示】 2021-08-27 14:20:36 +08:00
ZhangBiao 74f0e3f8a2 【玉虚论道】编队界面提交 2021-08-27 13:45:09 +08:00
zhangqiang 037c4a5ac8 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 11:14:12 +08:00
zhangshanxue c542bf612d 【资源】循环依赖处理 2021-08-26 22:29:58 +08:00
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +08:00
ZhangBiao 868939fa06 【觉醒】神将界面觉醒显示 2021-08-26 18:55:42 +08:00
ZhangBiao 3a102c93fa 【觉醒】神将界面觉醒显示 2021-08-26 18:54:14 +08:00
ZhangBiao f13f1937c7 【玉虚论道】其他人信息界面 2021-08-26 18:14:46 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
ZhangBiao dc943be130 【玉虚论道】其他人信息界面提价 2021-08-26 17:36:03 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
ZhangBiao c0ea5e1b7f 【玉虚论道】其他人编队信息界面 2021-08-26 17:14:13 +08:00
gaoxin be3afeb82a 【资源】重名资源修改 2021-08-26 17:02:42 +08:00
gaoxin f25148fb68 【资源】重名资源修改 2021-08-26 17:02:29 +08:00
gaoxin ea4599e860 Revert 回滚错误的合并 4f19f12612 2021-08-26 16:46:41 +08:00
gaoxin 68ac132040 【太初密卷】修改为拉伸的方式 2021-08-26 16:46:36 +08:00
zhangqiang 8cf472017b 【失败界面按钮位置调整】 2021-08-26 16:46:26 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin 2f9357608a 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
zhangshanxue 8d05854eb0 Merge commit '20554f8fd82082607fa75e9c89606a576faa6669' into china/test 2021-08-26 16:19:34 +08:00
zhangqiang 0202985814 【失败界面按钮位置调整】 2021-08-26 14:12:54 +08:00
zhangqiang 5b9542d391 【跨服十绝阵】请求跨服排行 2021-08-26 14:12:28 +08:00
ZhangBiao 6345a18ebe 【玉虚论道】我的编队界面 2021-08-26 13:42:17 +08:00
zhangqiang 20554f8fd8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-26 11:49:11 +08:00
zhangqiang 17e4c209c7 【神将列表】排序修改-张彪 2021-08-26 11:48:36 +08:00
ZhangBiao 391c538ceb 【玉虚论道】提交 2021-08-26 09:59:59 +08:00
gaoxin dd45768117 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 21:02:11 +08:00
gaoxin 0193d9a22e 【数数】修改部分数据到进入游戏时上报 2021-08-25 21:01:50 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
ZhangBiao 994763b560 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-08-25 20:31:38 +08:00
ZhangBiao 94b4d550e5 【玉虚论道】我的编队界面提交 2021-08-25 20:31:21 +08:00
gaoxin a6e93212d0 【数数】修改部分数据到进入游戏时上报 2021-08-25 19:38:49 +08:00
zhangqiang b44c1a3e8f 【装备界面】装备界面替换魂灵宝,会生成一个假的宝物 2021-08-25 18:07:05 +08:00
wangzhenxing bc654382c2 玉虚轮道预设提交 2021-08-25 16:56:18 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
jiaoyangna 404a30a57d 四灵修改提交 2021-08-25 15:15:50 +08:00