Commit Graph

135 Commits (60b842e2abe642adc42645fefda225e69752bb12)

Author SHA1 Message Date
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 8476199128 玉虚论道段位特效提交 2021-09-01 16:20:52 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
gaoxin 908ca14632 【shader】添加对所有平台的支持 2021-08-28 13:40:15 +08:00
zhangshanxue c542bf612d 【资源】循环依赖处理 2021-08-26 22:29:58 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
gaoxin 259b43f2c6 【称号】修复踏碎凌霄称号IOS黑片问题 2021-08-20 22:40:10 +08:00
wangzhenxing 3456f2b924 [战斗]====材质球提交 2021-08-25 17:11:39 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
zhangqiang c8a06d9c5d 【重复名】特效重复名提交 2021-08-25 13:55:37 +08:00
ZhangBiao d94d02849d 【寻宝迷踪】寻宝按钮特效增加 2021-08-13 17:46:58 +08:00
ZhangBiao 57cdcc0809 【寻宝迷踪】增加到达特效 2021-08-13 15:34:06 +08:00
ZhangBiao 4632665c49 【寻宝迷踪】拼图合成特效+小人落地特效 2021-08-11 17:53:59 +08:00
jiaoyangna ed3494e263 【ID1009947】
【优化】四元阵界面 新增界面特效
2021-08-05 15:09:58 +08:00
jiaoyangna 78a0c17a59 百宝商会特效修改提交 2021-08-04 11:47:37 +08:00
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