Commit Graph

458 Commits (a12c9330c752bb16991d95e3d5df9c2b1e7cdb10)

Author SHA1 Message Date
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +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
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +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
ZhangBiao 6c2e75b384 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-20 14:40:19 +08:00
jiaoyangna bb8ca3c5ca 四元阵跳转修改 2021-08-19 16:44:13 +08:00
ZhangBiao 9971d286ea 【寻宝迷踪】人物箭头提交 2021-08-16 15:37:01 +08:00
ZhangBiao 57cdcc0809 【寻宝迷踪】增加到达特效 2021-08-13 15:34:06 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
ZhangBiao bbe2bb6d6d 【寻宝迷踪】提交 2021-08-12 12:00:18 +08:00
ZhangBiao 13777a78cb 【寻宝迷踪】增加主角箭头 2021-08-11 19:33:01 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
jiaoyangna 34357fddff 滑动条修改提交 2021-08-06 15:47:31 +08:00
jiaoyangna 5cf3388a59 滑动 回弹修改提交 2021-08-06 11:29:06 +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 488b7469f6 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:52:30 +08:00
jiaoyangna 3f9b6be120 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:36:39 +08:00
wangzhenxing 4358ef97e3 [bug]====聊天界面称号特效穿透问题修改 2021-08-02 14:27:13 +08:00
ZhangBiao e829b33d14 【万象商会】白篇处理 2021-07-30 16:34:50 +08:00
gaoxin 5aadeb406b 【聊天】聊天框根据内容跳转到不同的频道 2021-07-30 14:07:08 +08:00
jiaoyangna f4cc4d7df6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:46:11 +08:00
jiaoyangna 7ee1ef9910 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
2021-07-28 17:45:59 +08:00
gaoxin e552db5499 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:43:04 +08:00
gaoxin ef78e0ae21 【跨服聊天】添加跨服聊天频道 2021-07-28 17:42:58 +08:00
jiaoyangna 7ac8f03cd3 Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
2021-07-28 16:58:52 +08:00
wangzhenxing 68e3a32140 [bug]====称号层级修改 2021-07-28 16:41:37 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
jiaoyangna 527295f30c 宝物优化 2021-07-28 10:51:39 +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
ZhangBiao 07de90eb45 【提交】 2021-07-26 15:07:49 +08:00
jiaoyangna 4590076eb9 Revert "宝物培养修改提交"
This reverts commit bcd0651029.
2021-07-26 10:00:59 +08:00
ZhangBiao 7e9fad28b7 【万象商会】提交 2021-07-24 19:33:56 +08:00
ZhangBiao 4c73ac0976 【万象商会】刷新 2021-07-24 18:59:42 +08:00
ZhangBiao ccc208b2c4 【万象商会】界面关闭 2021-07-24 17:02:30 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing 20bf67d50e 【称号】====称号特效显示修改,称号特效预设修改 2021-07-23 18:23:55 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
gaoxin 0db39ccbe3 Merge branch 'china/ios' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
2021-07-22 19:39:14 +08:00