Commit Graph

193 Commits (3131ffca2f78f78bd15209334867f841c3e1d0ef)

Author SHA1 Message Date
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna 72ddfad3c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:06:16 +08:00
jiaoyangna c8172c34a4 四灵试炼神魂修改提交 2021-11-05 18:06:01 +08:00
gaoxin 14f1d213e3 【神魂特效】资源名重复修改 2021-11-05 17:47:43 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
ZhangBiao 08e6f334a4 【装备界面】特效调整 2021-11-04 19:10:06 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
gaoxin de71cd524b 【周卡】特效不能被裁切修改 2021-11-04 14:02:48 +08:00
gaoxin 0237d3f351 【神魂】修复特效在3.5版本不显示的问题 2021-11-15 00:18:34 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
jiaoyangna 4eed456628 神魂图标修改 2021-11-03 13:25:08 +08:00
jiaoyangna a41765d10b 神魂提交 2021-11-02 10:20:17 +08:00
jiaoyangna 681f8d5a57 神魂提交 2021-11-01 19:11:59 +08:00
jiaoyangna c735599c77 至尊降世报错修改提价 2021-10-29 12:05:01 +08:00
jiaoyangna f4d9f0487d 神魂 2021-10-28 15:30:47 +08:00
jiaoyangna 2c23120253 神魂动画提交 2021-10-28 10:37:28 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
jiaoyangna edcdd0e81e Merge branch 'china/dev' into 0功能/神魂 2021-10-26 16:01:24 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
gaoxin 9a2e2581f9 【资源】名称重复修改 2021-11-10 05:30:59 +08:00
gaoxin bef3a23392 【资源】名称重复修改 2021-11-10 05:28:10 +08:00
jiaoyangna acc912a0e7 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-10-22 15:52:33 +08:00
jiaoyangna f5dc4a20b2 神魂出版提交 2021-10-22 15:47:59 +08:00
jiaoyangna 8fa8a9d690 至尊降世界面修改提交 2021-10-21 17:38:53 +08:00
ZhangBiao 45b9f3f3bb 【御剑行】增加特效 2021-10-16 15:08:29 +08:00
jiaoyangna 3f92309d78 好感度添加特效 2021-10-12 16:33:10 +08:00
JLIOSM1 13f9e653ae 【称号】罗浮之主称号显示错误 2021-09-29 20:41:19 +08:00
gaoxin 37381da67e 【特效】修复特效贴图过大的问题 2021-09-28 19:35:46 +08:00
gaoxin ddf0e9b981 【资源名修改后自动生成文件提交】 2021-09-22 16:01:11 +08:00
gaoxin 36dff25c3e 【资源名重复修改】 2021-09-22 15:55:19 +08:00
yuanshuai ab7570f3bb .meta 2021-09-22 15:39:07 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
yuanshuai 055f77d1c0 .meta 2021-09-18 15:45:03 +08:00
yuanshuai a48bf3027d .meta 2021-09-18 15:44:29 +08:00
yuanshuai 0d31e6b0f8 ,meta 2021-09-18 15:44:09 +08:00
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
gaoxin 7462f02cfd Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +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
zhangshanxue 4b6bce3b32 Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq 2021-09-02 20:16:05 +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
wangzhenxing 8476199128 玉虚论道段位特效提交 2021-09-01 16:20:52 +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 ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 03b00d7762 四元阵特效修改提交 2021-08-31 10:52:58 +08:00
zhangshanxue fe15c46f87 Merge remote-tracking branch 'origin/china/dev' into china/test 2021-08-28 15:21:19 +08:00
gaoxin 908ca14632 【shader】添加对所有平台的支持 2021-08-28 13:40:15 +08:00
zhangshanxue c542bf612d 【资源】循环依赖处理 2021-08-26 22:29:58 +08:00
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +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