Commit Graph

1831 Commits (0dd925c92422c366d5f6e66cf3a53aa442e2c371)

Author SHA1 Message Date
jiaoyangna b18b4cfd58 【皮肤】协议提交 2020-11-04 13:52:10 +08:00
jiaoyangna 4cb31d8f38 [皮肤]提交 2020-11-04 10:59:04 +08:00
jiaoyangna 509357e333 Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-04 10:54:54 +08:00
ZhangBiao 809c6daa01 【易经宝库】数据调试 2020-11-04 10:53:02 +08:00
JieLing f88884aa12 Merge branch 'master_xma_test' into master_online_hw 2020-11-04 10:49:28 +08:00
jiaoyangna 1fcdf5b2a6 【皮肤】添加皮肤属性加成 2020-11-03 19:37:05 +08:00
JieLing 04e3f5adca Merge branch 'master_xma_local' into master_xma_test 2020-11-03 19:24:35 +08:00
zhangqiang 3ae4ed1d41 【英雄合成】 添加提示 2020-11-03 19:19:13 +08:00
ZhangBiao ab757a2543 【特权商城】最后一分钟报错修改 2020-11-03 19:10:32 +08:00
ZhangBiao 5d40b102dc 【易经宝库】添加type 拼数据 2020-11-03 19:01:47 +08:00
gaoxin 5a861ade95 【商店】前端从表里判断商品的显示状态添加 2020-11-03 18:01:31 +08:00
jiaoyangna e92e63444b 皮肤提交 2020-11-03 17:27:32 +08:00
gaoxin e1625e6bed 【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题 2020-11-03 17:17:46 +08:00
ZhangBiao c3537b3486 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-03 17:05:15 +08:00
ZhangBiao 81e26c3128 【特权商城】增加 灵兽特权礼包 文字描述 2020-11-03 17:04:45 +08:00
zhangqiang 0a8498b95e 【灵兽系统】 召唤界面按钮文字位置 2020-11-03 16:08:10 +08:00
gaoxin 49576b20ad 【战斗】修复战斗内名称不显示和我方元素显示错误的问题 2020-11-03 15:34:22 +08:00
gaoxin 23717d6fc9 【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题 2020-11-03 15:34:12 +08:00
jiaoyangna d040e4dded 神将界面结构修改 2020-11-03 15:17:48 +08:00
zhangqiang 5d6db87650 【灵兽系统】召唤界面 按钮位置有问题 2020-11-03 14:51:58 +08:00
wangzhenxing 5f518babce [灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改 2020-11-03 14:18:02 +09:00
ZhangBiao f79499faea 【易经宝库】开始获取活动数据 2020-11-03 09:58:37 +08:00
JieLing 8c228f8de6 Merge branch 'master_xma_local' into master_xma_test 2020-11-03 01:01:13 +08:00
gaoxin d00d3e803c 【商店】删除商店的动画显示 2020-11-03 01:00:58 +08:00
gaoxin ba42282cc3 【战斗】修改会自己动的指定目标特效的显示时长 2020-11-03 01:00:53 +08:00
JieLing 162ab88e56 Merge branch 'master_xma_local' into master_xma_test 2020-11-02 23:27:09 +08:00
gaoxin 108e5b2568 【战斗】前摇特效添加指定位置释放的类型 2020-11-02 23:24:43 +08:00
JieLing a913a2de4e Merge branch 'master_xma_local' into master_xma_test 2020-11-02 23:21:00 +08:00
zhangqiang 342a1bd373 【灵兽系统】 放生选择数量修改 2020-11-02 23:09:58 +08:00
gaoxin 34b4b5db51 【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题 2020-11-02 22:55:24 +08:00
JieLing 4ef41f8aa1 Merge branch 'master_xma_local' into master_xma_test 2020-11-02 22:26:55 +08:00
gaoxin d10134216c 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题--2 2020-11-02 22:13:34 +08:00
gaoxin 9dc9ca2b2a 【战斗】修复战斗界面资源回收时报错 2020-11-02 22:13:30 +08:00
JieLing 9aba7f9efa Merge branch 'master_xma_local' into master_xma_test 2020-11-02 22:12:36 +08:00
gaoxin cb10b3ff1d 【战斗】修复人物技能会在零售技能释放完成之前加入对列,导致技能释放失败的问题。 2020-11-02 21:49:33 +08:00
gaoxin 9779a99414 【战斗】修复灵兽释放技能顺序错误 2020-11-02 21:24:00 +08:00
gaoxin 8b9276f6a2 【战斗】修复上一场残留数据会出现在下一场的问题 2020-11-02 21:23:55 +08:00
zhangqiang 8e9b7b49e7 【特权礼包】 购买后到期 报错 尝试修复 2020-11-02 20:51:25 +08:00
gaoxin 54f1660bc2 【好友切磋】修复战斗结果显示错误的问题 2020-11-02 19:17:19 +08:00
gaoxin 4cb8bee4ae 【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题 2020-11-02 19:17:14 +08:00
zhangqiang cbe24364ec 【灵兽系统】 调主城的位置 2020-11-02 18:16:28 +08:00
gaoxin 3a542e5c63 【战斗】技能特效添加会自己动的指定目标特效 2020-11-02 18:09:04 +08:00
ZhangBiao 8640018b87 【易经宝库】开坑 搭界面 和做动画 2020-11-02 18:05:24 +08:00
wangzhenxing 92d5b659a1 [放生灵兽]灵兽放生显示返还货币修改 2020-11-02 17:36:08 +09:00
zhangqiang 869f54799e 【灵兽系统】 加新手 加升级动画 2020-11-02 17:28:52 +08:00
wangzhenxing 5eaa5a725d [灵兽抽卡]灵兽抽卡显示修改 2020-11-02 17:19:06 +09:00
gaoxin 25f88a2a98 【LOG】删除无用log,添加凤凰技能概率log 2020-11-02 16:53:26 +08:00
gaoxin ad4ebc14a0 【战斗】修复凤凰概率技能无法生效的问题 2020-11-02 16:31:57 +08:00
wangzhenxing 6c388f5d94 【效果】添加119效果 2020-11-02 16:21:06 +09:00
zhangqiang 65b5cff36d 【灵兽系统】 修改bug 2020-11-02 16:17:33 +08:00
gaoxin acaece5483 【战斗】前端添加自动上传结果不一致的战斗数据的功能。 2020-11-02 16:07:43 +08:00
zhangqiang df8f8d6dd0 【灵兽系统】 加引导 和 特权加15日礼包 判断 2020-11-02 15:56:06 +08:00
wangzhenxing ce0e5a8229 【灵兽放生】灵兽放生界面数量超过一屏,选中底部灵兽选中状态错误修改 2020-11-02 15:02:47 +09:00
zhangqiang 3bbaab27be 【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序 2020-11-02 14:36:21 +08:00
gaoxin c90e209fd6 【战斗】修复技能效果修改导致被动技能报错的问题 2020-11-02 14:12:28 +08:00
wangzhenxing 52fbe638f6 [灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数 2020-11-02 13:59:55 +09:00
gaoxin 02a57e692c 【战斗】修复部分被动技能报错 2020-11-02 13:49:53 +08:00
zhangqiang 148b068c79 【达人排行榜】 达人排行榜底部显示问题 2020-11-02 12:54:36 +08:00
gaoxin 9b65cbba0f 【战斗】灵兽技能前摇特效播放位置调整,灵兽技能条件添加类型3,修复灵兽立绘不会回收的问题 2020-11-02 11:55:28 +08:00
zhangqiang 4cb30990e1 【灵兽系统】 bug 需同步 2020-11-02 11:52:00 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
zhangqiang 8f71eb7672 【灵兽系统】bug 同步到dev 2020-11-02 10:58:48 +08:00
gaoxin 230788670d 【战斗】主动效果117,118添加 2020-11-02 10:00:32 +08:00
gaoxin 9ed00e0ba5 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
gaoxin a2bfc34833 【音效】打开界面播放音效时不再播放点击音效 2020-11-01 14:45:09 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
gaoxin d7a33ed404 【逍遥游】首通需要显示奖励数量 2020-10-30 13:28:57 +08:00
gaoxin f519c35bbd 【逍遥游】修改地图的解锁方式为按顺序解锁,奖励显示不再显示数量并添加标签显示。 2020-10-30 13:28:19 +08:00
jiaoyangna 39dbd3f640 逍遥游幸运转盘提交 2020-10-30 13:27:45 +08:00
yuanshuai 1eba61731e 【逍遥游】首通奖励显示脚本提交 2020-10-30 11:03:50 +08:00
yuanshuai ec3defb2c4 【逍遥游】首通奖励协议提交 2020-10-30 11:03:39 +08:00
zhangqiang 018c571a93 【大闹天宫】 试炼节点 战斗结束掉英雄报错卡死 2020-10-30 10:27:57 +08:00
zhangqiang c4a9cb99cf 【主题活动】commit 2020-10-30 10:08:54 +08:00
zhangqiang 6c1cf4de1a 【运筹帷幄】1 2020-10-30 10:08:41 +08:00
JieLing 48bf02ce81 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-27 19:29:35 +08:00
JieLing 787f4e98a6 【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店 2020-10-27 19:25:27 +08:00
JieLing 6b21a191bc Merge branch 'master_xma_local' into master_xma_test 2020-10-27 17:08:34 +08:00
JieLing 0752b7694e 【排行榜】 排行榜显示 2020-10-27 16:23:35 +08:00
ZhangBiao 35f6a6c430 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
2020-10-27 16:16:10 +08:00
ZhangBiao acd3f336e9 【设计大典】特效添加 2020-10-27 16:15:34 +08:00
gaoxin ec7e498b87 【战斗】修复持续伤害会出现小数的问题 2020-10-27 15:16:04 +08:00
JieLing 419ebfa69d Merge branch 'master_xma_local' into master_xma_test 2020-10-27 13:54:28 +08:00
gaoxin 9add8d8dbf 【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题) 2020-10-27 13:53:32 +08:00
JieLing d60a0e09c3 Merge branch 'master_xma_local' into master_xma_test 2020-10-26 19:49:24 +08:00
gaoxin 88516ad0e2 【战斗】加血普攻会触发降怒被动的问题,修改被动技能195全部免疫改为部分免疫 2020-10-26 19:43:04 +08:00
JieLing 2badb6ba74 Merge branch 'master_xma_local' into master_xma_test 2020-10-26 19:28:10 +08:00
jiaoyangna 29789b6c0d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:45:12 +08:00
jiaoyangna 5d3d65871a [主题活动-社稷大典]商店立绘重叠提交 2020-10-26 18:44:57 +08:00
ZhangBiao 3d19d05b04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 18:07:40 +08:00
ZhangBiao d7ad797ce5 【车迟斗法】点击抢夺下方名字修改 2020-10-26 18:07:28 +08:00
JieLing 837d7d8886 【社稷大典】 公会排行显示问题 2020-10-26 17:59:58 +08:00
ZhangBiao 6eea05fa06 【竞技场】领奖界面报错修改 2020-10-26 17:30:26 +08:00
ZhangBiao 6149e88620 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 17:04:28 +08:00
ZhangBiao c2612e2ca8 【社稷大典】捐献后 左上角 按钮状态切换修复 2020-10-26 17:04:07 +08:00
JieLing 0b8abaeabf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:51:53 +08:00
jiaoyangna d8f5a48811 【累计充值】提示修改 2020-10-26 16:51:47 +08:00
ZhangBiao 5a20d41b77 【社稷大典】左上公会排行空白修改 2020-10-26 16:49:47 +08:00
ZhangBiao 0340b7d468 【社稷大典】打开社稷大典界面 时被提出公会 检测 2020-10-26 16:37:56 +08:00
ZhangBiao b2c841e572 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 16:11:11 +08:00
ZhangBiao 709dc1a5bd 【社稷大典】时间弹跳修复,物品边框颜色修改 2020-10-26 16:10:58 +08:00
yuanshuai 0fee60ea37 【逍遥游】骰子动画修改 2020-10-26 15:19:33 +08:00
jiaoyangna 942849cdcf Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-26 15:06:24 +08:00
jiaoyangna ce5db82250 乾坤商店立绘重叠,限时召唤up神将文字和icon重叠 修改 2020-10-26 15:05:59 +08:00
zhangqiang 0a5816a4ec 线上问题工会技能战力修改 2020-10-26 14:47:14 +08:00
zhangqiang b6f48c4910 线上战力 属性取整问题 2020-10-26 14:46:43 +08:00
JieLing 16264aa29e Merge branch 'master_xma_test' into master_online_hw 2020-10-21 07:40:25 +08:00
JieLing aefa24e263 Merge branch 'master_xma_local' into master_xma_test 2020-10-20 21:04:07 +08:00
gaoxin f4cfce396c Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit 1f9165688f.
2020-10-20 21:02:13 +08:00
gaoxin 1f9165688f 【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题 2020-10-20 20:37:51 +08:00
gaoxin cd03b49824 【战斗0.0.6】修复判断数据是否存在接口错误 2020-10-20 20:27:14 +08:00
JieLing 5d45429443 Merge branch 'master_xma_local' into master_xma_test 2020-10-20 18:42:38 +08:00
gaoxin 619ce2ea52 【逍遥游】筛子摇动和事件触发音效添加 2020-10-20 17:43:18 +08:00
wangzhenxing b5b8f79dca 技能期间只触发一次被动触发条件修改 2020-10-20 16:29:44 +08:00
yuanshuai 885de6fe9b 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:17:13 +08:00
ZhangBiao 958234c826 【推送礼包】推送最新礼包的拍脸 2020-10-20 14:58:50 +08:00
JieLing ee0e4a3193 Merge branch 'master_xma_local' into master_xma_test 2020-10-20 03:22:52 +08:00
JieLing cb6c7d393b 【竞技场】修复奖励不刷新2 2020-10-20 02:49:25 +08:00
JieLing 9007ed845a 【逍遥游】修复行动力不会恢复满的问题 2020-10-20 02:36:12 +08:00
JieLing 534ee58f6a 【竞技场】添加挑战次数显示,修复挑战后奖励显示不刷新的问题 2020-10-20 02:31:13 +08:00
JieLing bb2b8b1818 【竞技场】修复奖励界面打不开的问题 2020-10-20 01:56:42 +08:00
JieLing d514b3e0f8 【特效】修复获取不到特效节点的问题 2020-10-20 01:10:42 +08:00
gaoxin 3625da459f 【战斗】修复桃子技能错误 2020-10-20 00:39:27 +08:00
gaoxin c6704e6ed4 【逍遥游】修复白片问题 2020-10-20 00:38:49 +08:00
gaoxin f57b10696f 【逍遥游】云游值自动恢复修改 2020-10-20 00:29:09 +08:00
gaoxin d9434f425d 修复部分奖励不刷新的问题 2020-10-20 00:28:41 +08:00
yuanshuai a3c461aff9 云游值恢复问题修改 2020-10-20 00:28:09 +08:00
yuanshuai aa9c366242 逍遥bug修改 2020-10-20 00:27:34 +08:00
jiaoyangna 93db6c028a 竞技场奖励显示错误 2020-10-20 00:21:08 +08:00
jiaoyangna 6c4f4f5b2d boss commit 2020-10-19 23:40:50 +08:00
jiaoyangna d39c078888 xiaoyao commit 2020-10-19 23:37:24 +08:00
jiaoyangna 589e535e73 generalpopup commit 2020-10-19 23:18:54 +08:00
gaoxin f53a566ce8 【逍遥游】功能入口随功能开启添加 2020-10-19 22:57:02 +08:00
yuanshuai 0d4fd1a210 骰子动画添加提交 2020-10-19 22:56:56 +08:00
jiaoyangna dc7e1c71d4 逍遥commit 2020-10-19 22:42:39 +08:00
ZhangBiao a40b0dab17 逍遥游 commit 2020-10-19 22:38:57 +08:00
ZhangBiao 021692dc42 逍遥commit 2020-10-19 22:36:43 +08:00
jiaoyangna 6f0294902f Revert "逍遥游 兑换界面修改"
This reverts commit 8bed258441.
2020-10-19 22:25:23 +08:00
jiaoyangna 4aa18b7ac1 推送礼包派脸修改 2020-10-19 22:01:44 +08:00
jiaoyangna 61a07de094 拍脸commit 2020-10-19 22:01:34 +08:00
jiaoyangna a4dd2ffd38 心魔试炼 1 2020-10-19 22:01:15 +08:00
yuanshuai 3b8317a897 逍遥游红点提交 2020-10-19 21:40:48 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00
jiaoyangna 91778b2f77 【逍遥游】归元弹窗添加 2020-10-19 21:38:25 +08:00
gaoxin ed26e9e758 公会副本刷新次数打印提交 2020-10-19 21:30:19 +08:00
ZhangBiao 1c955039ec Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-19 21:25:22 +08:00
ZhangBiao e3bd86ef08 轩辕 修改 提交
(cherry picked from commit 27f8331e62)
2020-10-19 21:25:12 +08:00
gaoxin 73063a72e3 【战斗0.0.4】代码遗漏补齐, 2020-10-19 21:06:01 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
ZhangBiao cd782feb4d Merge branch '0活动开发聚集地/竞技场界面修改' into master_xma_local 2020-10-19 20:14:31 +08:00
ZhangBiao 56f5856a71 宝箱个数减负 2020-10-19 20:10:53 +08:00
ZhangBiao 43201d2172 每日 赛季奖励 显示错误修复 2020-10-19 19:41:36 +08:00
ZhangBiao b52ebf46f4 竞技场 bug修改 2020-10-19 19:34:48 +08:00
ZhangBiao 4c5065ccf7 竞技场界面修改 2020-10-19 18:52:36 +08:00
gaoxin d33fe98ef1 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 18:38:15 +08:00
gaoxin 05780afedb 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 18:37:59 +08:00
gaoxin 321aa22ec6 【战斗 0.0.3】尝试修复偶现战斗卡死得问题 2020-10-19 18:37:51 +08:00
ZhangBiao e39706e312 遴选 社稷大典中对奖励界面的修改,到竞技场界面修改 2020-10-19 14:01:30 +08:00
ZhangBiao 09c3da664e 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
gaoxin 5dc4062a46 【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题 2020-10-17 20:08:40 +08:00
gaoxin 6326a8ab9a 【战斗0.0.1-同步local】添加引导战斗暂停接口 2020-10-17 19:03:34 +08:00
gaoxin 0baed21bf6 战斗逻辑同步 2020-10-17 18:35:52 +08:00
gaoxin 3810fc2da1 修复关卡推送礼包报错的问题 2020-10-17 18:19:03 +08:00
gaoxin 5e7bcff321 【竞技场周任务减负-1】前端还没做,表提交错误处理 2020-10-17 16:50:32 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
ZhangBiao 0dbf805ef8 限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d)
2020-10-23 17:38:45 +08:00
ZhangBiao 3b3a41c432 主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc)
2020-10-23 17:38:33 +08:00
JieLing 386992eaa9 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-16 18:13:36 +08:00
ZhangBiao 9ac6eac395 礼包拍脸时机修复 2020-10-16 18:11:24 +08:00
ZhangBiao 4c55e3f1f0 推送礼包 special表id更改 2020-10-16 18:09:13 +08:00
ZhangBiao 8c4ff7e148 推送礼包 完事儿 2020-10-16 17:59:16 +08:00
jiaoyangna 435590808a 推送礼包修改 2020-10-16 17:59:00 +08:00
jiaoyangna 0fe316420a 推送礼包修改 2020-10-16 17:58:46 +08:00
ZhangBiao f0e9063c97 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-16 17:56:39 +08:00
JieLing 5293464305 Merge branch 'master_xma_test' into master_online_hw
# Conflicts:
#	Assets/LuaFramework/Scenes/Logo.unity
#	Assets/ManagedResources/Effects/Animation/Effect_c_dj_0008_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Effects/Animation/Effect_c_hsmw_00010_attack_02_anim.anim.meta
#	Assets/ManagedResources/Effects/Animation/fx_skill03_04xifu_SR_01.anim.meta
#	Assets/ManagedResources/Effects/Model/Plane03.FBX.meta
#	Assets/ManagedResources/Effects/Model/daoguang.FBX.meta
#	Assets/ManagedResources/Effects/Model/daoguang_tuowei01.FBX.meta
#	Assets/ManagedResources/Effects/Textures/T_glow_03.png.meta
#	Assets/ManagedResources/Effects/Textures/T_noise_12.tga.meta
#	Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_01_PNG.PNG.meta
#	Assets/ManagedResources/Effects/Textures/ui_MainWindow_Baoxiang_04_png.png.meta
#	Assets/ManagedResources/Effects/Textures/ui_mainwindow_TX_4_PNG.PNG.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Plugins/Android/libs/PSDK/mhtsdk.aar
#	Assets/Plugins/Android/libs/PSDK/psdk.aar
#	Assets/Plugins/Android/libs/PSDK/psdk_mht.aar
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lz4/atlas/cardatlas.unity3d
#	BuildABs/Android/lz4/atlas/eightdayatlas.unity3d
#	BuildABs/Android/lz4/atlas/findtreasureatlas.unity3d
#	BuildABs/Android/lz4/atlas/mainatlas.unity3d
#	BuildABs/Android/lz4/atlas/publicatlas.unity3d
#	BuildABs/Android/lz4/audio/gameaudiomixer.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_hhe01.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_hsmw01.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_jtxn01.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_kqmw01.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_swk01.unity3d
#	BuildABs/Android/lz4/audio/skill/actor_voc/audio_battle_vo_zbj01.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_c_ch_0015_skeff_slidesk_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_c_yr_0007_skeff_slidesk_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_effect_buff_sheild.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_hg_3002_skeff_casting_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_jhj_3003_skeff_casting_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_tl_3004_skeff_casting_buff01.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_s_jieling_zlz_3001_skeff_casting_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_skeff_buff_01.unity3d
#	BuildABs/Android/lz4/audio/skill/buff/audio_skeff_debuff_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_bahy_0017_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_byjy_0038_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ddk_0023_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ddk_0023_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_dhx_0022_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_dhx_0022_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_djx_0048_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_djy_0013_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ds_0011_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ds_0011_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_fc_0032_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_fwkl_0010_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_fwwb_0016_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_fwwb_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_gc_0025_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ghboss_50001_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ghboss_50001_skeff_tap_atacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_gmyl_0030_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hjyl_0043_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hwws_0008_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hwws_0008_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hydyg_0001_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hydyg_0001_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hyjl_0002_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hyjl_0002_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hypd_0003_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_hypd_0003_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jdjs_0009_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jjdl_0044_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jy_0004_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jy_0004_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_jyw_0005_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_kl_0007_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_kn_0018_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_kn_0018_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_lrh_0027_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_lrh_0027_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_mg_0047_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_mmls_0045_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_my_0037_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_mz_0020_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_mz_0020_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_rtz_0012_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_rtz_0012_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_sg_0024_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_sg_0024_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_sm_0021_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_sm_0021_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_tap_atacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_syjm_0026_skeff_tap_doteff.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_wy_0019_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_wy_0019_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_xdd_0015_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_xdd_0015_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_xyysz_0014_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_xyysz_0014_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ymmj_0040_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_skeff_slide_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/monster/audio_m_ys_0028_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ab_00014_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ax_0067_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_axl_00061_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_bhxz_00013_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_bm_0068_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_bmf_0004_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_bmf_0004_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ce_00034_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cff_0047_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cff_0049_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ch_0015_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ch_0015_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cq_0005_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cs_0031_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cy_00031_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cy_00031_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_cyh_0008_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_daji_0094_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_daji_0094_tapsk_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ddtz_00049_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_dhdj_00042_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_dj_0008_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_dlsm_00033_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_dst_00023_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_dz_00058_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_eh_00035_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fhlh_00021_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fjzd_0055_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fm_0027_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fm_0027_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ft_00026_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fx_00028_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_fzy_0061_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_gg_0005_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_skeff_casting_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ghn_0009_tapsk_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_gt_0001_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_gyps_00020_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_hdxj_00066_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_hhe_00011_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_hsmw_00010_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_hyt_0032_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jbj_0007_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jcdp_00027_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jff_0050_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jhsn_0021_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jls_00044_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jlzz_00060_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jlzz_00060_skeff_slidesk_buff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jmm_0006_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jpw_0024_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jtxn_00045_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jw_0003_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jy_00055_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jy_0029_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jz_0002_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_jzy_00043_skeff_tapsk_healeff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_kq_0018_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_kqmw_00018_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_lc_00050_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ldb_00047_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_leizhenzi_0095_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_leizhenzi_0095_tapsk_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ljgz_00032_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ls_0004_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ls_0004_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_lslz_00046_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_lsx_00069_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0025_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0039_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ly_0070_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_lzz_0002_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_lzz_0002_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mc_0034_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_skeff_slidesk_debuff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_md_00064_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mlmn_0054_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mp_00051_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mrzq_0010_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mz_00038_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_mz_00062_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ne_0058_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_nezha_0089_slidesk_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_nezha_0089_tapsk_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_nxq_00054_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ny_00036_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_nz_00029_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_pxps_00024_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_pxps_00024_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_qf_0046_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_qlq_0006_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_qr_0065_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_rd_00019_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_rj_0033_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sdxj_00067_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sgb_00041_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sjnn_00012_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_skr_0028_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_skr_0028_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sq_0019_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sxdw_0053_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_sxdw_0056_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_syf_0016_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_syf_0016_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ts_00017_attack_01_1.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ttjz_00048_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_tx_0011_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_wg_00037_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_wg_00037_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_wl_0036_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_wsps_00016_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_wuchen_0106_tapsk_slidesk_ballistic.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xhht_0017_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xhht_0017_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xjr_0003_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xllh_00022_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xllh_00022_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0026_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_xy_0075_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_y_0013_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yangjian_0092_tapsk_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yc_00052_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yff_0048_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ygl_00056_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ygps_00025_skeff_tapsk_healeff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yhj_00057_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yhj_00057_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yj_00040_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yl_0014_skeff_slidesk_ballistic.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yl_0035_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ylw_00053_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ym_0051_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ym_0052_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yqe_0071_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yqj_0042_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yr_0007_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yr_0007_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ywe_0078_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ywg_0045_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ywg_0045_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ywy_0040_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_ywy_0040_skeff_slidesk_screeneff.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_yxz_0057_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_zc_0021_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_zgm_00039_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_zh_0044_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_c_zs_0080_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_common_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ab_00014_t3_attack01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_dj_0008_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_dj_0008_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_fhlh_00021_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_gg_0005_t3_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ghn_0009_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_ghn_0009_t3_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jcdp_00027_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jmm_0006_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jmm_0006_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jw_0003_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_jzy_00043_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_kqmw_00018_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_kqmw_00018_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_nz_00029_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_rd_00019_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_rd_00019_t3_attack_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_wsps_00016_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_effect_c_xllh_00022_t3_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_fx_c_yxz_0057_skill01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_fx_effect_cst_skill01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_fx_effect_cst_skill03.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_n_glgsoldiercap_0007_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_n_hurtsoldier_0021_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_n_jjlyfisher_0005_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_02.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_03.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_04.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_05.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_normal_effect_06.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_dlg_3010_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_fl_3008_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_hs_3006_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_lms_3009_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_md_3007_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audio_s_jieling_sl_3005_attack_01.unity3d
#	BuildABs/Android/lz4/audio/skill/skill/audioc_swk_00015_attack_01.unity3d
#	BuildABs/Android/lz4/audio/ui/common/ui_battle_01.unity3d
#	BuildABs/Android/lz4/audio/ui/common/ui_commonclick.unity3d
#	BuildABs/Android/lz4/audio/ui/common/ui_recruit_01.unity3d
#	BuildABs/Android/lz4/audio/ui/special/ui_029_02.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_1.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_2.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_3.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_4.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_5.unity3d
#	BuildABs/Android/lz4/bg/trialmap3/slfb_01_6.unity3d
#	BuildABs/Android/lz4/bg/wjfb-04/wjfb-04_23.unity3d
#	BuildABs/Android/lz4/icons.unity3d
#	BuildABs/Android/lz4/prefabs/effect/aoe/fx_effect_cst_skill01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/buff/c_ch_0015_skeff_slidesk_buff.unity3d
#	BuildABs/Android/lz4/prefabs/effect/casting/fx_c_yxz_0057_skill01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/hit/c_mrzq_0010_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/prefabs/effect/hit/c_yl_0014_skeff_slidesk_attacked.unity3d
#	BuildABs/Android/lz4/prefabs/effect/hit/normal_effect.unity3d
#	BuildABs/Android/lz4/prefabs/effect/monster/m_djy_0013_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/prefabs/effect/monster/m_fwwb_0016_skeff_tap_attacked.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ab_00014_t3_attack01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ab_00014_t3_attack03.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_dj_0008_attack_02.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_fhlh_00021_t3_attack_01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_ghn_0009_t3_attack_02.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_jw_0003_attack_01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_rd_00019_t3_attack_01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_rd_00019_t3_attack_03.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_wsps_00016_t3_attack_01.unity3d
#	BuildABs/Android/lz4/prefabs/effect/skill/effect_c_wsps_00016_t3_attack_02.unity3d
#	BuildABs/Android/lz4/prefabs/live2d.unity3d
#	BuildABs/Android/lz4/prefabs/ui/arena.unity3d
#	BuildABs/Android/lz4/prefabs/ui/arenatopmatch.unity3d
#	BuildABs/Android/lz4/prefabs/ui/bag.unity3d
#	BuildABs/Android/lz4/prefabs/ui/battle.unity3d
#	BuildABs/Android/lz4/prefabs/ui/carbon.unity3d
#	BuildABs/Android/lz4/prefabs/ui/common.unity3d
#	BuildABs/Android/lz4/prefabs/ui/compound.unity3d
#	BuildABs/Android/lz4/prefabs/ui/eightdaygift.unity3d
#	BuildABs/Android/lz4/prefabs/ui/expedition.unity3d
#	BuildABs/Android/lz4/prefabs/ui/expert.unity3d
#	BuildABs/Android/lz4/prefabs/ui/fight.unity3d
#	BuildABs/Android/lz4/prefabs/ui/findtreasure.unity3d
#	BuildABs/Android/lz4/prefabs/ui/firstrecharge.unity3d
#	BuildABs/Android/lz4/prefabs/ui/formation.unity3d
#	BuildABs/Android/lz4/prefabs/ui/guild.unity3d
#	BuildABs/Android/lz4/prefabs/ui/handbook.unity3d
#	BuildABs/Android/lz4/prefabs/ui/loading.unity3d
#	BuildABs/Android/lz4/prefabs/ui/login.unity3d
#	BuildABs/Android/lz4/prefabs/ui/luckyturntable.unity3d
#	BuildABs/Android/lz4/prefabs/ui/main.unity3d
#	BuildABs/Android/lz4/prefabs/ui/map.unity3d
#	BuildABs/Android/lz4/prefabs/ui/message.unity3d
#	BuildABs/Android/lz4/prefabs/ui/mission.unity3d
#	BuildABs/Android/lz4/prefabs/ui/monstercamp.unity3d
#	BuildABs/Android/lz4/prefabs/ui/operating.unity3d
#	BuildABs/Android/lz4/prefabs/ui/popup.unity3d
#	BuildABs/Android/lz4/prefabs/ui/power.unity3d
#	BuildABs/Android/lz4/prefabs/ui/recruit.unity3d
#	BuildABs/Android/lz4/prefabs/ui/resolve.unity3d
#	BuildABs/Android/lz4/prefabs/ui/roleinfo.unity3d
#	BuildABs/Android/lz4/prefabs/ui/setting.unity3d
#	BuildABs/Android/lz4/prefabs/ui/soulprint.unity3d
#	BuildABs/Android/lz4/prefabs/ui/view.unity3d
#	BuildABs/Android/lz4/prefabs/ui/vip.unity3d
#	BuildABs/Android/lz4/publicartres/animations.unity3d
#	BuildABs/Android/lz4/publicartres/materials.unity3d
#	BuildABs/Android/lz4/publicartres/models.unity3d
#	BuildABs/Android/lz4/publicartres/shaders.unity3d
#	BuildABs/Android/lz4/publicartres/textures.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture1.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture2.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture3.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture4.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture5.unity3d
#	BuildABs/Android/lz4/rtexture/cardtexture6.unity3d
#	BuildABs/Android/lz4/updatepanel.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
2020-10-15 17:40:45 +08:00
JieLing bfdb7998c6 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 22:33:32 +08:00
gaoxin 8e3e25a450 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:32:37 +08:00
jiaoyangna f35bad0ee2 神州令跳转修改 2020-10-15 21:36:16 +08:00
jiaoyangna 14986fb3f5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-15 21:30:32 +08:00
jiaoyangna 98c80ed67c 森罗幻境 修改 2020-10-15 21:26:56 +08:00
jiaoyangna 36559e89a7 【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点 2020-10-22 01:25:03 +08:00
jiaoyangna 72c09f393c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-21 23:18:44 +08:00
jiaoyangna 97bb590c24 主题活动修改 2020-10-21 23:18:39 +08:00
JieLing 3cee54d991 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 21:33:41 +08:00
JieLing fc51ea9a27 Merge branch 'master_xma_local' into master_xma_test 2020-10-13 16:11:06 +08:00
JieLing bff69e473d 招募玩家详情展示魂印有问题 2020-10-13 15:51:20 +08:00
JieLing 602c8e9e02 监听事件未移除正确 2020-10-12 20:44:15 +08:00
zhangqiang fe8c903b31 限时升级活动打开后 退出一段时间再返回报错 2020-10-12 19:34:33 +08:00
jiaoyangna 2b6705f176 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 17:13:44 +08:00
gaoxin 74abae8e84 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 17:00:46 +08:00
zhangqiang 6f9521e400 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-12 16:59:53 +08:00
jiaoyangna 31895e8e25 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:44 +08:00
jiaoyangna 13b9886ddb Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:56:10 +08:00
jiaoyangna e84efa0961 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:56:05 +08:00
ZhangBiao e2b0244881 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 16:08:23 +08:00
ZhangBiao 767ac32ee1 回春散手动使用 数量不刷新 修复 2020-10-12 16:08:13 +08:00
zhangqiang 721418b30a 线上问题 宝器分解bug 2020-10-12 15:55:04 +08:00
JieLing d58311bb2b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-12 15:43:06 +08:00
gaoxin 199326c74b 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 15:42:12 +08:00
ZhangBiao aec2eb929c (cherry picked from commit f087c0258b) 2020-10-12 15:39:57 +08:00
ZhangBiao ff33dd07db 森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
2020-10-12 15:15:02 +08:00
ZhangBiao a47d882155 森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
2020-10-12 15:14:27 +08:00
zhangqiang 2f31dad427 线上问题 vip 战力计算打开 只是表的 pvp 评分配成0 2020-10-12 14:48:22 +08:00
zhangqiang b92be60aef 线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错 2020-10-12 14:47:56 +08:00
gaoxin d9fbacce65 修改bug 限时活动itemView报错 2020-10-12 14:47:42 +08:00
zhangqiang 89d70855a4 线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3 2020-10-12 14:47:20 +08:00
zhangqiang d2792bdb8b 线上活动 森罗幻境达人前端修改2 2020-10-12 14:47:02 +08:00
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
gaoxin 36b366bf97 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 14:35:23 +08:00
jiaoyangna 49e94e9204 森罗幻境动画删除 2020-10-12 14:00:55 +08:00
jiaoyangna 0c91a81329 【跳转】碧海卷使用按钮跳转位置不正确 2020-10-15 16:05:53 +08:00
jiaoyangna b574323186 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-15 16:01:07 +08:00
jiaoyangna 0b0776c220 【丹心碧血】限时兑换活动界面黑屏 2020-10-15 16:00:58 +08:00
jiaoyangna d340795646 主题活动修改 提交 2020-10-10 17:59:30 +08:00
jiaoyangna 9706c45942 主题活动修改 2020-10-10 16:15:27 +08:00
jiaoyangna d51468cdca 势不可挡页签修改提交 2020-10-10 16:14:33 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 8c5132185b 轩辕宝镜黑屏问题解决 2020-10-10 16:05:02 +08:00
ZhangBiao eb7b46f992 大闹天宫节点商店名称与内容不符修复
(cherry picked from commit 314dee578a)
2020-10-10 14:51:45 +08:00
gaoxin 0f3eda62d3 如果宝物被分解了,重复穿戴检测会报错 2020-10-10 14:43:20 +08:00
gaoxin f9f608e63a 再次修复登录时区服显示错误的问题 2020-10-10 14:43:14 +08:00
gaoxin eae5d1767a 添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上 2020-10-10 14:42:58 +08:00
jiaoyangna 0d99260d1a 【丹心碧血】限时召唤,up卡显示不正确 2020-10-10 13:39:50 +08:00
gaoxin 77b3855221 如果宝物被分解了,重复穿戴检测会报错 2020-10-10 10:35:49 +08:00
gaoxin b95a75310c 再次修复登录时区服显示错误的问题 2020-10-10 10:00:07 +08:00
JieLing bd09adfcba Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-10-10 09:59:35 +08:00
jiaoyangna e7a695553f 轩辕宝镜关闭时销毁时间 2020-10-24 09:44:56 +08:00
JieLing c74f5b4618 Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-10-10 09:43:09 +08:00
jiaoyangna 57232d3591 轩辕宝镜关闭时销毁时间 2020-10-15 17:27:50 +08:00
jiaoyangna 3deee80779 限时抢购界面修改 2020-10-15 21:28:23 +08:00
jiaoyangna 4ba6146a46 限时抢购界面修改 2020-10-15 21:24:08 +08:00
jiaoyangna 7b9a4140f7 青龙秘宝任务报错修改 2020-10-15 18:18:46 +08:00
jiaoyangna 8b75d0a9d1 百宝商会修改提交 2020-10-15 17:16:32 +08:00
jiaoyangna 8759e04261 购买等级报错修改 2020-10-15 16:38:32 +08:00
jiaoyangna feda1432e3 Merge branch 'master_xma_test' of http://60.1.1.230/gaoxin/JL_Client into master_xma_test 2020-10-15 16:32:08 +08:00
jiaoyangna 8b1012892f 青龙秘宝礼包状态修改 2020-10-15 16:31:53 +08:00
gaoxin 9ff73bfa4c 添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上 2020-10-09 21:46:03 +08:00
jiaoyangna e93e6d73ab 一键宝物重复穿戴宝物bug 修改 2020-10-09 17:41:02 +08:00
JieLing ab53bf530b 修复设置界面兑换码功能跟随服务器版本设置不生效的问题 2020-10-09 17:32:21 +08:00
JieLing b50602d94c Merge branch 'master_xma_test' into master_xma_local 2020-10-09 17:02:03 +08:00
zhangqiang 297d71d2ff 线上问题 无尽副本轮换前5分钟无法进入 2020-10-09 15:21:00 +08:00
zhangqiang f56fa9d4e8 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-09 15:20:53 +08:00
gaoxin 422a8abaa4 修复属性类被动会导致战斗日志报错的问题 2020-10-09 14:26:28 +08:00
jiaoyangna 8ff0382e41 丹心碧血主界面icon 修改提交 2020-10-15 14:06:16 +08:00
jiaoyangna 2e272debe3 一键宝物重复穿戴宝物bug 修改 2020-10-15 14:06:06 +08:00
jiaoyangna d249eb412f 丹心碧血提交 2020-10-15 14:05:56 +08:00
jiaoyangna 8a43d1c9da 主题活动修改 2020-10-15 14:05:41 +08:00
jiaoyangna 7c38428100 丹心碧血图片提交 2020-10-15 14:04:45 +08:00
zhangqiang a697e38584 修改为正式服 2020-09-30 11:15:56 +08:00
JieLing bd5d9da3bf 部分功能通过判断提审服和正式服进行开启和关闭 2020-09-30 11:14:43 +08:00