wangzhenxing
|
d6f8875ee7
|
[称号]======罗浮之主称号特效闪烁问题修改
|
2021-07-30 10:46:32 +08:00 |
wangzhenxing
|
126eba3f26
|
[称号]==========罗浮争锋三个称号特效预设修改
|
2021-07-29 16:19:48 +08:00 |
wangzhenxing
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +08:00 |
zhangqiang
|
042644bdcb
|
【资源】冲突处理
|
2021-07-27 13:53:37 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
34b7a00d47
|
【特效】重名资源处理
|
2021-07-27 10:19:33 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
wangzhenxing
|
20bf67d50e
|
【称号】====称号特效显示修改,称号特效预设修改
|
2021-07-23 18:23:55 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
zhangqiang
|
e28d538565
|
【资源冲突处理】
|
2021-07-22 10:23:09 +08:00 |
ZhangBiao
|
d639f0ccd3
|
资源名重复
|
2021-07-15 19:57:30 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b97a35ce8
|
mata 文件修改提交
|
2021-07-15 19:44:55 +08:00 |
ZhangBiao
|
edaacd0e69
|
重复名资源提交
|
2021-07-15 17:24:56 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bd4f1f483
|
Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-15 16:24:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
55607708df
|
资源修改提交
|
2021-07-15 16:19:27 +08:00 |
DESKTOP-98AVA47\Administrator
|
25ffe0ff1f
|
玲珑宝镜特效提交
|
2021-07-15 15:58:01 +08:00 |
ZhangBiao
|
e3baabda96
|
【副本界面】特效提交
|
2021-07-15 15:25:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
25939d4d25
|
玲珑宝镜特效上传
|
2021-07-15 14:44:19 +08:00 |
gaoxin
|
9c58070aa8
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
# Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
# Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
|
2021-07-06 15:27:09 +08:00 |
jiaoyangna
|
410a0cac4f
|
神将来源跳转星辰商店修改提交
|
2021-07-01 18:22:36 +08:00 |
jiaoyangna
|
21033f3260
|
特效颜色修改
|
2021-07-01 18:01:35 +08:00 |
jiaoyangna
|
bfd653a98f
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:48:05 +08:00 |
jiaoyangna
|
349404d50e
|
【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
|
2021-06-30 19:28:43 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
ZhangBiao
|
24469e4666
|
【灵兽山】特效修改
|
2021-06-28 16:56:26 +08:00 |
ZhangBiao
|
4e2463723a
|
【灵兽】特效添加
|
2021-06-26 14:50:52 +08:00 |
ZhangBiao
|
0a7d9bedc4
|
Revert "【灵兽山】特效资源提交"
This reverts commit aa495f7392.
|
2021-06-25 18:22:28 +08:00 |
ZhangBiao
|
aa495f7392
|
【灵兽山】特效资源提交
|
2021-06-25 18:16:52 +08:00 |
zhangqiang
|
c7f8a84c99
|
【特效】主城/挂机界面自己小人脚底添加光圈
|
2021-06-24 16:15:39 +08:00 |
gaoxin
|
c60fe0c7c6
|
【资源】修复玉帝皮肤技能显示错误
|
2021-06-22 20:58:52 +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 |