zhangqiang
|
c7f8a84c99
|
【特效】主城/挂机界面自己小人脚底添加光圈
|
2021-06-24 16:15:39 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
JieLing
|
2e798c6888
|
【资源名重复】
|
2021-06-10 18:24:59 +08:00 |
zhangqiang
|
0598fe8bdf
|
【修行特效】
|
2021-06-10 13:45:23 +08:00 |
zhangqiang
|
9a1f0078df
|
【部分美术效果无法展示】1
|
2021-06-09 15:58:04 +08:00 |
wangzhenxing
|
5cf037f6da
|
[称号]=======聊天界面新称号显示修改
|
2021-06-02 21:07:02 +08:00 |
jiaoyangna
|
43941d2c7b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 15:45:06 +08:00 |
jiaoyangna
|
755edc5913
|
百宝商会特效提交
|
2021-06-02 15:42:46 +08:00 |
gaoxin
|
dbcaf8e5ca
|
【称号】踏碎凌霄称号显示优化
|
2021-06-02 11:25:06 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
gaoxin
|
61be59d1f3
|
【称号】显示优化
|
2021-06-01 18:08:00 +08:00 |
gaoxin
|
7f0e97dd32
|
【资源】名字重复修正
|
2021-05-31 16:29:01 +08:00 |
gaoxin
|
9b3a837d4d
|
【资源】踏碎凌霄称号资源上传
|
2021-05-31 15:01:58 +08:00 |
zhangqiang
|
9a4f1a64b2
|
【漏提】
|
2021-05-28 15:01:18 +08:00 |
zhangqiang
|
63671cacbb
|
【修改图片加载方式 】 增加踏碎凌霄称号预设 没特效
|
2021-05-28 14:18:41 +08:00 |
jiaoyangna
|
9ef020d022
|
重复资源修改提交
|
2021-05-27 20:49:35 +08:00 |
zhangqiang
|
b92e659e53
|
【山河社稷图】特效提交
|
2021-05-27 20:17:53 +08:00 |
ZhangBiao
|
45602214d8
|
【修行】特效增加
|
2021-05-27 17:57:49 +08:00 |
ZhangBiao
|
b417d4eaa4
|
【修行】特效导入
|
2021-05-27 17:40:54 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
wangzhenxing
|
368f6b7b64
|
超凡入圣称号特效贴图修改提交
|
2021-05-24 11:17:44 +08:00 |
wangzhenxing
|
1478142476
|
称号资源替换提交
|
2021-05-22 15:02:09 +08:00 |
gaoxin
|
4a9cdc80fa
|
【资源】资源名重复修整
|
2021-04-29 21:08:11 +08:00 |
gaoxin
|
a26bdd837e
|
【资源】遗漏资源补齐
|
2021-04-29 20:53:00 +08:00 |
gaoxin
|
0b260fd03a
|
【资源】至尊降世资源修改
|
2021-04-29 20:48:39 +08:00 |
gaoxin
|
5f09e64257
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-29 20:19:10 +08:00 |
jiaoyangna
|
dd8d7df89f
|
剧情特效提交
|
2021-04-29 18:55:31 +08:00 |
gaoxin
|
7bae49b1c2
|
【至尊降世】特效修改
|
2021-04-29 17:53:40 +08:00 |
gaoxin
|
37f976e4be
|
【资源】资源缺失提交
|
2021-04-28 02:43:24 +08:00 |
gaoxin
|
5f3ec93c01
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:50:19 +08:00 |
gaoxin
|
668f78d3d2
|
【资源】重复资源名处理
|
2021-04-27 23:50:14 +08:00 |
jiaoyangna
|
974279f565
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua
|
2021-04-27 23:43:58 +08:00 |
jiaoyangna
|
07810200cb
|
剧情提交
|
2021-04-27 23:37:16 +08:00 |
wangzhenxing
|
d2a7fdcee1
|
天尊降世活动资源提交
|
2021-04-27 22:16:42 +08:00 |
jiaoyangna
|
5b9b72fea5
|
资源提交
(cherry picked from commit 059c9940cc)
|
2021-04-27 16:19:20 +08:00 |
jiaoyangna
|
059c9940cc
|
资源提交
|
2021-04-27 16:16:41 +08:00 |
jiaoyangna
|
1537410e05
|
剧情提交
|
2021-04-27 14:06:04 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
wangzhenxing
|
8e24eea290
|
称号bug修改
|
2021-04-21 14:42:06 +08:00 |
ZhangBiao
|
30361f5393
|
【限时活动】调整提交
|
2021-04-21 11:37:55 +08:00 |
gaoxin
|
2c80bc9953
|
【资源】同名资源文件处理修改
|
2021-04-19 13:59:01 +08:00 |
jiaoyangna
|
92104541fc
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
# Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-04-16 15:42:39 +08:00 |
jiaoyangna
|
f91b6f8ca1
|
资源重复修改提交
|
2021-04-16 14:53:44 +08:00 |
JieLing
|
bfce2a542a
|
【资源】重名文件处理,meta文件提交
|
2021-04-12 22:06:58 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
jiaoyangna
|
ac9387af2a
|
重复资源提交
(cherry picked from commit 3471fde5d2)
|
2021-04-09 13:56:23 +08:00 |
jiaoyangna
|
3471fde5d2
|
重复资源提交
|
2021-04-09 13:55:55 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |