Commit Graph

164 Commits (b0e24676b38b1309fb2c5a23df0c57bcac5b125a)

Author SHA1 Message Date
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
gaoxin ea4599e860 Revert 回滚错误的合并 4f19f12612 2021-08-26 16:46:41 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
zhangshanxue 8d05854eb0 Merge commit '20554f8fd82082607fa75e9c89606a576faa6669' into china/test 2021-08-26 16:19:34 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
zhangqiang c8a06d9c5d 【重复名】特效重复名提交 2021-08-25 13:55:37 +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
zhangshanxue 2dccecd185 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
2021-08-21 14:45:17 +08:00
gaoxin 259b43f2c6 【称号】修复踏碎凌霄称号IOS黑片问题 2021-08-20 22:40:10 +08:00
wangzhenxing 3456f2b924 [战斗]====材质球提交 2021-08-25 17:11:39 +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 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
jiaoyangna ed3494e263 【ID1009947】
【优化】四元阵界面 新增界面特效
2021-08-05 15:09:58 +08:00
jiaoyangna 78a0c17a59 百宝商会特效修改提交 2021-08-04 11:47:37 +08:00
JieLing 1468825d8d Merge branch 'china/local' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_anim_02.anim
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_anim_02.anim.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_ctr_02.controller
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_ctr_02.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua
2021-07-30 17:40:42 +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
JieLing 1fc8df188d 【新称号】删除无用动画资源 2021-07-27 10:27:55 +08:00
JieLing 7551842ba7 Merge branch 'china/dev' into china/test 2021-07-27 10:25:03 +08:00
gaoxin 34b7a00d47 【特效】重名资源处理 2021-07-27 10:19:33 +08:00
JieLing 460152864d Merge branch 'china/dev' into china/test 2021-07-27 09:45:38 +08:00
ZhangBiao 74c713c65b 【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度 2021-07-26 19:00:41 +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
JieLing 55ab6b992e Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Textures/Fx_tex_os4_ani_017.png.meta
#	Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-26 10:20:29 +08:00
JieLing 7116d9137d 【心魔试炼】资源丢失 资源冲突解决提交 2021-07-23 18:54:10 +08:00