miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel
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
..
View Merge branch 'china/dev' into 0功能/silingshilian 2021-08-06 11:15:13 +08:00
View2 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
View3 【修行】this.spLoader提交 2021-05-20 09:48:52 +08:00
AttriTips.lua 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
AttriTips.lua.meta 【修行】增加属性提升提示 2021-06-01 13:54:21 +08:00
CongratulationPopup.lua 【修行】恭喜破镜 2021-05-19 18:27:57 +08:00
CongratulationPopup.lua.meta 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00
GeneralBigPopup.lua Merge branch 'china/dev' into 0功能/silingshilian 2021-08-06 11:15:13 +08:00
GeneralBigPopup.lua.meta 【易经宝库】提交 2020-11-05 19:10:20 +08:00
GeneralInfoPopup.lua 【修行】提交 2021-05-19 16:14:09 +08:00
GeneralInfoPopup.lua.meta 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
GeneralRankRewardPanel.lua 描述修改提交 2021-07-14 17:18:13 +08:00
GeneralRankRewardPanel.lua.meta 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
View.meta 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
View2.meta 【修行】玩家信息界面怎加技能详情 2021-05-18 16:13:26 +08:00
View3.meta 【修行】新增通用恭喜界面 2021-05-19 16:56:49 +08:00